aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-09-06 19:42:48 +0300
committerEli Zaretskii2012-09-06 19:42:48 +0300
commit0216c1289b6ff1aa692ab5e7e8fe3f56e760a278 (patch)
tree053c6a4f74145b98131af20b26db62f4c1e53cec /src
parentd458ef98df8da78f9f102da5f4a066df400ca8cd (diff)
downloademacs-0216c1289b6ff1aa692ab5e7e8fe3f56e760a278.tar.gz
emacs-0216c1289b6ff1aa692ab5e7e8fe3f56e760a278.zip
Fix bug #12327 with SIGCHLD handling on Windows and some other systems.
src/process.c (CAN_HANDLE_MULTIPLE_CHILDREN): Fix a typo that broke SIGCHLD handling on systems that don't have WNOHANG.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a017ef7fdab..479fb38e60b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-09-06 Eli Zaretskii <eliz@gnu.org>
2
3 * process.c (CAN_HANDLE_MULTIPLE_CHILDREN): Fix a typo that broke
4 SIGCHLD handling on systems that don't have WNOHANG. (Bug#12327)
5
12012-09-06 Dmitry Antipov <dmantipov@yandex.ru> 62012-09-06 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 Explicitly mark buffer_defaults and buffer_local_symbols. 8 Explicitly mark buffer_defaults and buffer_local_symbols.
diff --git a/src/process.c b/src/process.c
index 3a6615fb505..9ab8d2720b2 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6518,9 +6518,9 @@ record_child_status_change (void)
6518#if (defined WINDOWSNT \ 6518#if (defined WINDOWSNT \
6519 || (defined USG && !defined GNU_LINUX \ 6519 || (defined USG && !defined GNU_LINUX \
6520 && !(defined HPUX && defined WNOHANG))) 6520 && !(defined HPUX && defined WNOHANG)))
6521enum { CAN_HANDLE_MULTIPLE_CHILDREN = 1 };
6522#else
6523enum { CAN_HANDLE_MULTIPLE_CHILDREN = 0 }; 6521enum { CAN_HANDLE_MULTIPLE_CHILDREN = 0 };
6522#else
6523enum { CAN_HANDLE_MULTIPLE_CHILDREN = 1 };
6524#endif 6524#endif
6525 6525
6526static void 6526static void