From 7d549c0382eb4cd7a27476fdf4fd12bb2b0d3603 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 3 Apr 2015 20:01:19 +0100 Subject: [PATCH] fixup! mingw: uglify pthread_mutex_init definition to shut up warning --- compat/nedmalloc/malloc.c.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index 18634e3a3b..9df8aaed87 100644 --- a/compat/nedmalloc/malloc.c.h +++ b/compat/nedmalloc/malloc.c.h @@ -1804,9 +1804,10 @@ struct win32_mlock_t volatile long threadid; }; +static inline int return_0(int i) { return 0; } #define MLOCK_T struct win32_mlock_t #define CURRENT_THREAD win32_getcurrentthreadid() -#define INITIAL_LOCK(sl) (memset(sl, 0, sizeof(MLOCK_T)), 0) +#define INITIAL_LOCK(sl) (memset(sl, 0, sizeof(MLOCK_T)), return_0(0)) #define ACQUIRE_LOCK(sl) win32_acquire_lock(sl) #define RELEASE_LOCK(sl) win32_release_lock(sl) #define TRY_LOCK(sl) win32_try_lock(sl)