diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2008-03-21 17:48:28 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2008-03-21 17:48:28 +0200 |
| commit | f6871c0d661d1d6be814cc539bd33d5bf1a243d2 (patch) | |
| tree | 4f0c113cf15f0425c7fedd53da1c81aa881a00ea /include/config-win.h | |
| parent | 9d03658bf2b846410f86acd6cc97a446a1ee9113 (diff) | |
| parent | dff2a4c3a3c219417340870fc25796b498e67764 (diff) | |
| download | mariadb-git-f6871c0d661d1d6be814cc539bd33d5bf1a243d2.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B26461-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 e0558ca4564..a53332a9c2e 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 */ @@ -472,4 +470,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 |