diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-27 23:34:12 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-27 23:34:12 +0100 |
| commit | 938e0817d677bb4d69779849a431d490ff0c3dc7 (patch) | |
| tree | 432acab1ed6fe07e9087cf7577c8910fcfbb6900 /include/config-win.h | |
| parent | f1af483909f7cd3d8a68d45d97866633a2839c58 (diff) | |
| parent | 50f2f20c86a44790477e02a7852e1e2377a1b099 (diff) | |
| download | mariadb-git-938e0817d677bb4d69779849a431d490ff0c3dc7.tar.gz | |
Merge mysql.com:/misc/mysql/mysql-5.1
into mysql.com:/misc/mysql/mysql-5.1-opt
CMakeLists.txt:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
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 |