diff options
| author | Samuel Thibault | 2011-04-10 18:05:04 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-04-10 18:05:04 -0400 |
| commit | 300f9fca551d3aa024ff24b85e6ab7f0ae49ae03 (patch) | |
| tree | bf64ce7a78c14914557235b4420d6a0b892cac7e /src | |
| parent | 6f21a3198d25844445ab58a5f08d968197e5ea4e (diff) | |
| download | emacs-300f9fca551d3aa024ff24b85e6ab7f0ae49ae03.tar.gz emacs-300f9fca551d3aa024ff24b85e6ab7f0ae49ae03.zip | |
Fix wait_for_termination on GNU Hurd (Bug#8467)
* sysdep.c (wait_for_termination): On GNU Hurd, kill returns -1 on zombies.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/sysdep.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3c6d4fc8841..f82494f8a04 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-04-10 Samuel Thibault <sthibault@debian.org> (tiny change) | ||
| 2 | |||
| 3 | * sysdep.c (wait_for_termination): On GNU Hurd, kill returns -1 on | ||
| 4 | zombies (Bug#8467). | ||
| 5 | |||
| 1 | 2011-04-10 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-04-10 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * buffer.c (syms_of_buffer): Doc fix (Bug#6902). | 8 | * buffer.c (syms_of_buffer): Doc fix (Bug#6902). |
diff --git a/src/sysdep.c b/src/sysdep.c index 1fbc0617904..3abb43f14d2 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -411,7 +411,7 @@ wait_for_termination (pid) | |||
| 411 | while (1) | 411 | while (1) |
| 412 | { | 412 | { |
| 413 | #ifdef subprocesses | 413 | #ifdef subprocesses |
| 414 | #if defined (BSD_SYSTEM) || defined (HPUX) | 414 | #if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined(__GNU__) |
| 415 | /* Note that kill returns -1 even if the process is just a zombie now. | 415 | /* Note that kill returns -1 even if the process is just a zombie now. |
| 416 | But inevitably a SIGCHLD interrupt should be generated | 416 | But inevitably a SIGCHLD interrupt should be generated |
| 417 | and child_sig will do wait3 and make the process go away. */ | 417 | and child_sig will do wait3 and make the process go away. */ |