summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-10-06 03:49:14 +0200
committerunknown <kent@mysql.com>2005-10-06 03:49:14 +0200
commit3c2dca475dfa91c95f2488831fafacacaf852347 (patch)
treeb8cf9d7e88d91c2c65a75d919d3497d44ea4303f /include
parent157e1fcb642cffffc68e380e1ecd30bb03a01c4a (diff)
downloadmariadb-git-3c2dca475dfa91c95f2488831fafacacaf852347.tar.gz
my_pthread.h:
Let pthread_mutex_init() macro return 0 on Windows mysql_priv.h: Return type is to be 'my_bool' for 'opt_enable_shared_memory' sql/mysql_priv.h: Return type is to be 'my_bool' for 'opt_enable_shared_memory' include/my_pthread.h: Let pthread_mutex_init() macro return 0 on Windows
Diffstat (limited to 'include')
-rw-r--r--include/my_pthread.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 132a298bc69..057b71356db 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -144,7 +144,7 @@ extern int pthread_mutex_destroy (pthread_mutex_t *);
#define pthread_kill(A,B) raise(B)
#define pthread_exit(A) pthread_dummy()
#else
-#define pthread_mutex_init(A,B) InitializeCriticalSection(A)
+#define pthread_mutex_init(A,B) (InitializeCriticalSection(A),0)
#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
#define pthread_mutex_trylock(A) (WaitForSingleObject((A), 0) == WAIT_TIMEOUT)
#define pthread_mutex_unlock(A) LeaveCriticalSection(A)