diff options
| author | tnurnberg@white.intern.koehntopp.de <> | 2008-03-27 23:35:56 +0100 |
|---|---|---|
| committer | tnurnberg@white.intern.koehntopp.de <> | 2008-03-27 23:35:56 +0100 |
| commit | 282825af3324378053227c0fd10c387ea151aa0b (patch) | |
| tree | b9f89b444f3abe5cf19b8d54c93829194bd6ace8 /include | |
| parent | dc00a524640646d8fadc8a906ed91343fdd43fc6 (diff) | |
| parent | 931582bb581d7d8a6d8619b05af19409c6800801 (diff) | |
| download | mariadb-git-282825af3324378053227c0fd10c387ea151aa0b.tar.gz | |
Merge mysql.com:/misc/mysql/mysql-5.0
into mysql.com:/misc/mysql/mysql-5.0-opt
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 4 | ||||
| -rw-r--r-- | include/my_global.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/config-win.h b/include/config-win.h index e5abe580b3f..2628095a181 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -157,14 +157,12 @@ typedef uint rf_SetTimer; #define Socket_defined #define my_socket SOCKET -#define bool BOOL #define SIGPIPE SIGINT #define RETQSORTTYPE void #define QSORT_TYPE_IS_VOID #define RETSIGTYPE void #define SOCKET_SIZE_TYPE int #define my_socket_defined -#define bool_defined #define byte_defined #define HUGE_PTR #define STDCALL __stdcall /* Used by libmysql.dll */ @@ -403,4 +401,4 @@ inline double ulonglong2double(ulonglong value) #define HAVE_CHARSET_ujis 1 #define HAVE_CHARSET_utf8 1 #define HAVE_UCA_COLLATIONS 1 - +#define HAVE_BOOL 1 diff --git a/include/my_global.h b/include/my_global.h index f290b690630..b0a26e67d9b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -980,7 +980,7 @@ typedef int myf; /* Type of MyFlags in my_funcs */ typedef char byte; /* Smallest addressable unit */ #endif typedef char my_bool; /* Small bool */ -#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) +#if !defined(bool) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) typedef char bool; /* Ordinary boolean values 0 1 */ #endif /* Macros for converting *constants* to the right type */ |