Skip to content

Commit b153d2a

Browse files
committed
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
2 parents 1f66975 + ed84387 commit b153d2a

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

compat/mingw.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ static inline int fcntl(int fd, int cmd, ...)
142142
#define sigemptyset(x) (void)0
143143
static inline int sigaddset(sigset_t *set, int signum)
144144
{ return 0; }
145+
#define SIG_BLOCK 0
145146
#define SIG_UNBLOCK 0
146147
static inline int sigprocmask(int how, const sigset_t *set, sigset_t *oldset)
147148
{ return 0; }

compat/win32/pthread.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,11 @@ static inline void *pthread_getspecific(pthread_key_t key)
104104
return TlsGetValue(key);
105105
}
106106

107+
#ifndef __MINGW64_VERSION_MAJOR
108+
static inline int pthread_sigmask(int how, const sigset_t *set, sigset_t *oset)
109+
{
110+
return 0;
111+
}
112+
#endif
113+
107114
#endif /* PTHREAD_H */

0 commit comments

Comments
 (0)