global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-05 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

mingw: uglify pthread_mutex_init definition to shut up warning

Browse Source 
When the result of a (a, 0) expression is not used, GCC now 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>
This commit is contained in:
Johannes Schindelin
2015-03-31 17:39:54 +01:00
parent bd469f34ef
commit 9a67f5f264
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compat/nedmalloc/malloc.c.h
View File

@@ -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)

5
compat/win32/pthread.h
View File

@@ -18,7 +18,10 @@
*/
#define pthread_mutex_t CRITICAL_SECTION
#define pthread_mutex_init(a,b) (InitializeCriticalSection((a)), 0)
static inline int return_0(int i) {
return 0;
}
#define pthread_mutex_init(a,b) return_0((InitializeCriticalSection((a)), 0))
#define pthread_mutex_destroy(a) DeleteCriticalSection((a))
#define pthread_mutex_lock EnterCriticalSection
#define pthread_mutex_unlock LeaveCriticalSection