From ed84387a6bfe271e9c1edd277bb6fad54c6a6f0b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 11 May 2016 17:10:30 +0200 Subject: [PATCH] Windows: only add a no-op pthread_sigmask() when needed In f924b52 (Windows: add pthread_sigmask() that does nothing, 2016-05-01), we introduced a no-op for Windows. However, this breaks building Git in Git for Windows' SDK because pthread_sigmask() is already a no-op there, #define'd in the pthread_signal.h header in /mingw64/x86_64-w64-mingw32/include/. Let's wrap the definition of pthread_sigmask() in a guard that skips it when compiling with MinGW-w64' headers. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- compat/win32/pthread.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h index e74157cd4d..7eac560d85 100644 --- a/compat/win32/pthread.h +++ b/compat/win32/pthread.h @@ -101,9 +101,11 @@ static inline void *pthread_getspecific(pthread_key_t key) return TlsGetValue(key); } +#ifndef __MINGW64_VERSION_MAJOR static inline int pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) { return 0; } +#endif #endif /* PTHREAD_H */ -- 2.11.4.GIT