diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-01-15 14:24:45 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-01-15 14:02:39 -0800 |
| commit | 2921600afbcdd5f245475602cabba2fbaa5ff93f (patch) | |
| tree | fc48ca8425ea3af259213fe6955434b01d911a78 /compat/nedmalloc | |
| parent | mingw: squash another warning about a cast (diff) | |
| download | tgif-2921600afbcdd5f245475602cabba2fbaa5ff93f.tar.xz | |
mingw: uglify (a, 0) definitions to shut up warnings
When the result of a (a, 0) expression is not used, MSys2's GCC version
finds it necessary to complain with a warning:
right-hand operand of comma expression has no effect
Let's just pretend to use the 0 value and have a peaceful and quiet life
again.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/nedmalloc')
| -rw-r--r-- | compat/nedmalloc/malloc.c.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index bf70037b4b..b833ff9225 100644 --- a/compat/nedmalloc/malloc.c.h +++ b/compat/nedmalloc/malloc.c.h @@ -1802,9 +1802,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) |