diff options
| author | kent@mysql.com <> | 2005-10-06 03:49:14 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2005-10-06 03:49:14 +0200 |
| commit | 3af12c477662114f4e118bba6806af65f64b9793 (patch) | |
| tree | b8cf9d7e88d91c2c65a75d919d3497d44ea4303f /include/my_pthread.h | |
| parent | 9077ee44076673c2e1f75128fcdaa62782d2ed91 (diff) | |
| download | mariadb-git-3af12c477662114f4e118bba6806af65f64b9793.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'
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 2 |
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) |