summaryrefslogtreecommitdiff
path: root/include/config-win.h
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2008-07-14 16:16:37 -0400
committerChad MILLER <chad@mysql.com>2008-07-14 16:16:37 -0400
commita4e7283a9254c09057c92ec20fc145c52bea1d51 (patch)
tree6009880c2c51b3422d95a760220fb7a20ebdb3e0 /include/config-win.h
parentc425bf421da9ffa55d3d568f70508fa12dd07aa0 (diff)
parent55ab1ef6951428e0be31956e152537dec670e7df (diff)
downloadmariadb-git-a4e7283a9254c09057c92ec20fc145c52bea1d51.tar.gz
Merge from 5.0 trunk.
Diffstat (limited to 'include/config-win.h')
-rw-r--r--include/config-win.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/config-win.h b/include/config-win.h
index f3c48510494..59c2d2706e5 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 */
@@ -406,4 +404,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