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 guard the definition of pthread_sigmask() in #ifndef...#endif to make the code compile both with modern MinGW-w64 as well as with the previously common MinGW headers. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- This patch is obviously based on 'next' (because 'master' does not have the referenced commit yet). Published-As: https://github.com/dscho/git/releases/tag/mingw-sigmask-v1 compat/win32/pthread.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h index d336451..8df702c 100644 --- a/compat/win32/pthread.h +++ b/compat/win32/pthread.h @@ -104,9 +104,11 @@ static inline void *pthread_getspecific(pthread_key_t key) return TlsGetValue(key); } +#ifndef pthread_sigmask static inline int pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) { return 0; } +#endif #endif /* PTHREAD_H */ -- 2.8.2.463.g99156ee -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html