| commit | ed84387a6bfe271e9c1edd277bb6fad54c6a6f0b | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 11 May 2016 15:10:30 +0000 (11 17:10 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 May 2016 21:02:10 +0000 (11 14:02 -0700) | ||
| tree | 7dff7631fc812c3068b342b5e8c49dd2d4791fea | treesnapshot (tar.gz zip) |
| parent | f924b52a7779038cee94151f0c1ee144652bccbe | commitdiff |
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>
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>
| compat/win32/pthread.h | diffblobblamehistory |