diff options
author | tnurnberg@white.intern.koehntopp.de <> | 2008-03-27 23:34:12 +0100 |
---|---|---|
committer | tnurnberg@white.intern.koehntopp.de <> | 2008-03-27 23:34:12 +0100 |
commit | a3df2a4cf4e0af82695378189e2f17d4b89078fd (patch) | |
tree | 432acab1ed6fe07e9087cf7577c8910fcfbb6900 /include/config-win.h | |
parent | fe0bff70e0d7b2cb52b95c315eb7e3976dbb4e74 (diff) | |
parent | 02235ace7b3d3aeac9826f479612ea7eca95ca61 (diff) | |
download | mariadb-git-a3df2a4cf4e0af82695378189e2f17d4b89078fd.tar.gz |
Merge mysql.com:/misc/mysql/mysql-5.1
into mysql.com:/misc/mysql/mysql-5.1-opt
Diffstat (limited to 'include/config-win.h')
-rw-r--r-- | include/config-win.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/config-win.h b/include/config-win.h index 170b4b451c7..7211dd59c84 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -158,14 +158,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 */ @@ -407,4 +405,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 |