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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
May 11, 2016 at 17:10 UTC
ed84387a6bfe271e9c1edd277bb6fad54c6a6f0b
1 file changed
+2
compat/win32/pthread.h
+2
@@ -101,9 +101,11 @@ static inline void *pthread_getspecific(pthread_key_t key)
101
return TlsGetValue(key);
102
}
103
104
+#ifndef __MINGW64_VERSION_MAJOR
105
static inline int pthread_sigmask(int how, const sigset_t *set, sigset_t *oset)
106
{
107
return 0;
108
}
109
+#endif
110
111
#endif /* PTHREAD_H */