summaryrefslogtreecommitdiff
path: root/ext/mysql/libmysql/my_wincond.c
diff options
context:
space:
mode:
authorMySQL Team <mysql@php.net>2001-01-23 16:48:50 +0000
committerMySQL Team <mysql@php.net>2001-01-23 16:48:50 +0000
commit800f555b707c696798877c80352ded46289e87c4 (patch)
treec540242b6e6da4e9b99b46797a26b215abef0a64 /ext/mysql/libmysql/my_wincond.c
parentd36858681a0d48414702524ebd16f31289b06fa8 (diff)
downloadphp-git-800f555b707c696798877c80352ded46289e87c4.tar.gz
Upgrade ext/mysql/libmysql to version 3.23.32. One notable bug fix is
that the client can now connect to a server which is using a default charset other than latin1.
Diffstat (limited to 'ext/mysql/libmysql/my_wincond.c')
-rw-r--r--ext/mysql/libmysql/my_wincond.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysql/libmysql/my_wincond.c b/ext/mysql/libmysql/my_wincond.c
index 179a969119..555ab3bcf7 100644
--- a/ext/mysql/libmysql/my_wincond.c
+++ b/ext/mysql/libmysql/my_wincond.c
@@ -1,13 +1,13 @@
/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
-
/*****************************************************************************
** The following is a simple implementation of posix conditions
*****************************************************************************/
+#undef SAFE_MUTEX /* Avoid safe_mutex redefinitions */
#include "mysys_priv.h"
-#if defined(THREAD) && defined(__WIN32__)
+#if defined(THREAD) && defined(__WIN__)
#include <m_string.h>
#undef getpid
#include <process.h>
@@ -125,4 +125,4 @@ struct tm *localtime_r(const time_t *timep,struct tm *tmp)
}
return tmp;
}
-#endif /* __WIN32__ */
+#endif /* __WIN__ */