diff options
author | Paul Eggert <[email protected]> | 2011-04-25 23:17:52 -0700 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2011-04-25 23:17:52 -0700 |
commit | 671875dac181f7f1337f21d013a9c3d5f235ddf2 (patch) | |
tree | 4091c2537439713df8efe8d3376116a6db3eb1c5 /src/sysdep.c | |
parent | f904488ff40dcee3e340b63a6386dde124d1241c (diff) | |
parent | 0c6b7b19e52ba18b5d4fd2d4b73b133a0a721603 (diff) |
Merge from mainline.
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 a57b8c0382..ca7de4f54b 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -304,7 +304,7 @@ wait_for_termination (int pid) { while (1) { -#if defined (BSD_SYSTEM) || defined (HPUX) +#if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined(__GNU__) /* Note that kill returns -1 even if the process is just a zombie now. But inevitably a SIGCHLD interrupt should be generated and child_sig will do wait3 and make the process go away. */ |