diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:06 -0700 |
| commit | c555e529ac1d29ed98229698d38f77ebb684a017 (patch) | |
| tree | f33f100493be4c07ad3b59d72dbcaeb853d1481b /compat | |
| parent | 920f2ea33bdf06dfda272a146c6fbce2ae11bf99 (diff) | |
| parent | ed84387a6bfe271e9c1edd277bb6fad54c6a6f0b (diff) | |
| download | git-c555e529ac1d29ed98229698d38f77ebb684a017.tar.gz | |
Merge branch 'jk/push-client-deadlock-fix' into HEAD
Some Windows SDK lacks pthread_sigmask() implementation and fails
to compile the recently updated "git push" codepath that uses it.
* jk/push-client-deadlock-fix:
Windows: only add a no-op pthread_sigmask() when needed
Windows: add pthread_sigmask() that does nothing
t5504: drop sigpipe=ok from push tests
fetch-pack: isolate sigpipe in demuxer thread
send-pack: isolate sigpipe in demuxer thread
run-command: teach async threads to ignore SIGPIPE
send-pack: close demux pipe before finishing async process
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.h | 1 | ||||
| -rw-r--r-- | compat/win32/pthread.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 1de70ffd62..edec9e0253 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -142,6 +142,7 @@ static inline int fcntl(int fd, int cmd, ...) #define sigemptyset(x) (void)0 static inline int sigaddset(sigset_t *set, int signum) { return 0; } +#define SIG_BLOCK 0 #define SIG_UNBLOCK 0 static inline int sigprocmask(int how, const sigset_t *set, sigset_t *oldset) { return 0; } diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h index b6ed9e7462..1c164088fb 100644 --- a/compat/win32/pthread.h +++ b/compat/win32/pthread.h @@ -104,4 +104,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 */ |