Changeset 565
- Timestamp:
- Mar 9, 2006, 1:41:02 PM (15 years ago)
- Location:
- libcaca/trunk/caca
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/caca/caca.c
r554 r565 22 22 #include "config.h" 23 23 24 #include <stdlib.h> 25 #include <string.h> 24 #if !defined(__KERNEL__) 25 # include <stdlib.h> 26 # include <string.h> 27 #endif 26 28 27 29 #include "cucul.h" … … 152 154 else 153 155 #endif 156 #if defined(USE_VGA) 157 if(!strcasecmp(var, "vga")) 158 vga_init_driver(kk); 159 else 160 #endif 154 161 return -1; 155 162 … … 164 171 #if defined(USE_CONIO) 165 172 conio_init_driver(kk); 173 return 0; 174 #endif 175 #if defined(USE_VGA) 176 vga_init_driver(kk); 166 177 return 0; 167 178 #endif -
libcaca/trunk/caca/caca_internals.h
r554 r565 21 21 #define __CACA_INTERNALS_H__ 22 22 23 #if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)23 #if defined(HAVE_INTTYPES_H) && !defined(__KERNEL__) 24 24 # include <inttypes.h> 25 #elif !defined(CUSTOM_INTTYPES) 25 #elif !defined(CUSTOM_INTTYPES) && !defined(_DOXYGEN_SKIP_ME) 26 26 # define CUSTOM_INTTYPES 27 27 typedef unsigned char uint8_t; … … 58 58 CACA_DRIVER_NETWORK = 7, 59 59 #endif 60 #if defined(USE_VGA) 61 CACA_DRIVER_VGA = 8, 62 #endif 60 63 CACA_DRIVER_NONE = 0 61 64 }; … … 82 85 #if defined(USE_NETWORK) 83 86 void network_init_driver(caca_t *); 87 #endif 88 #if defined(USE_VGA) 89 void vga_init_driver(caca_t *); 84 90 #endif 85 91 /* Timer structure */
Note: See TracChangeset
for help on using the changeset viewer.