summaryrefslogtreecommitdiff
path: root/include/config-win.h
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-12-24 10:56:13 +0300
committerAlexander Nozdrin <alik@sun.com>2009-12-24 10:56:13 +0300
commit0ae23cd69d3c13dba2a73750e93abf3342f21eb4 (patch)
tree27d736b66dbef96f0119023bc78b639f7a59faaa /include/config-win.h
parent6e9dad7e67e377ce14bc528c614d6ff7491235d0 (diff)
parentf6a8efbea3f8572c72066343b58ba88e679edc2c (diff)
downloadmariadb-git-0ae23cd69d3c13dba2a73750e93abf3342f21eb4.tar.gz
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'include/config-win.h')
-rw-r--r--include/config-win.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h
index 68248c09bef..01e1d44a436 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -190,7 +190,7 @@ typedef SSIZE_T ssize_t;
#define isnan(X) _isnan(X)
#define finite(X) _finite(X)
-#ifndef UNDEF_THREAD_HACK
+#ifndef MYSQL_CLIENT_NO_THREADS
#define THREAD
#endif
#define VOID_SIGHANDLER