diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-21 09:14:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-21 09:14:28 -0700 |
| commit | d80b7640b12496f86eb534460c7edfe1a5f1d79e (patch) | |
| tree | aa1ac4653eb1d3d7fb5a42333518381e59c2770d /compat | |
| parent | fe02fe75fcfea2f487284f4507c3d86760d71805 (diff) | |
| parent | d83e1eef3bbf8cd85ce5ffc4afff3fbdfb006fd1 (diff) | |
| download | git-d80b7640b12496f86eb534460c7edfe1a5f1d79e.tar.gz | |
Merge branch 'cb/daemon-reap-children'
Futz with SIGCHLD handling in "git daemon".
* cb/daemon-reap-children:
daemon: use sigaction() to install child_handler()
compat/mingw: allow sigaction(SIGCHLD)
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw-posix.h | 1 | ||||
| -rw-r--r-- | compat/mingw.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/compat/mingw-posix.h b/compat/mingw-posix.h index 88e0cf9292..631a208684 100644 --- a/compat/mingw-posix.h +++ b/compat/mingw-posix.h @@ -96,6 +96,7 @@ struct sigaction { unsigned sa_flags; }; #define SA_RESTART 0 +#define SA_NOCLDSTOP 1 struct itimerval { struct timeval it_value, it_interval; diff --git a/compat/mingw.c b/compat/mingw.c index 8a9972a1ca..5d69ae32f4 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -2561,7 +2561,9 @@ int setitimer(int type UNUSED, struct itimerval *in, struct itimerval *out) int sigaction(int sig, struct sigaction *in, struct sigaction *out) { - if (sig != SIGALRM) + if (sig == SIGCHLD) + return -1; + else if (sig != SIGALRM) return errno = EINVAL, error("sigaction only implemented for SIGALRM"); if (out) |