diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-18 15:11:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 15:11:46 -0700 |
| commit | b153d2ae9206f752dd383c7bc30a5ab246ee5bcc (patch) | |
| tree | 042610dd966e3eaaad3f7f61bd4ffd96e3004a16 /compat/mingw.h | |
| parent | 1f66975deb8402131fbf7c14330d0c7cdebaeaa2 (diff) | |
| parent | ed84387a6bfe271e9c1edd277bb6fad54c6a6f0b (diff) | |
| download | git-b153d2ae9206f752dd383c7bc30a5ab246ee5bcc.tar.gz | |
Merge branch 'jk/push-client-deadlock-fix'
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
Diffstat (limited to 'compat/mingw.h')
| -rw-r--r-- | compat/mingw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index a1808b4e6b..69bb43dc35 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; } |