diff options
| author | Glenn Morris | 2011-04-22 20:07:16 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-04-22 20:07:16 -0700 |
| commit | 4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640 (patch) | |
| tree | 26c20c7c4da56fae7e041c9345c76cce1224188c /src/sysdep.c | |
| parent | 81de9236e1daa1fe7dfd0ef9aaaf1e13b6aa74e4 (diff) | |
| parent | be71f8100a71a5b896ef05c32f51a09a3d9e3993 (diff) | |
| download | emacs-4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640.tar.gz emacs-4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640.zip | |
Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index 45e80ac0155..4b3a78e154e 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -304,7 +304,7 @@ wait_for_termination (int pid) | |||
| 304 | { | 304 | { |
| 305 | while (1) | 305 | while (1) |
| 306 | { | 306 | { |
| 307 | #if defined (BSD_SYSTEM) || defined (HPUX) | 307 | #if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined(__GNU__) |
| 308 | /* Note that kill returns -1 even if the process is just a zombie now. | 308 | /* Note that kill returns -1 even if the process is just a zombie now. |
| 309 | But inevitably a SIGCHLD interrupt should be generated | 309 | But inevitably a SIGCHLD interrupt should be generated |
| 310 | and child_sig will do wait3 and make the process go away. */ | 310 | and child_sig will do wait3 and make the process go away. */ |