From: Samuel Thibault <sthibault@debian.org>
Date: Sun, 10 Apr 2011 22:05:04 +0000 (-0400)
Subject: Fix wait_for_termination on GNU Hurd (Bug#8467)
X-Git-Tag: emacs-pretest-24.0.90~104^3~74
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=300f9fca551d3aa024ff24b85e6ab7f0ae49ae03;p=emacs.git

Fix wait_for_termination on GNU Hurd (Bug#8467)

* sysdep.c (wait_for_termination): On GNU Hurd, kill returns -1 on zombies.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3c6d4fc8841..f82494f8a04 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-10  Samuel Thibault  <sthibault@debian.org>  (tiny change)
+
+	* sysdep.c (wait_for_termination): On GNU Hurd, kill returns -1 on
+	zombies (Bug#8467).
+
 2011-04-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* 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)
   while (1)
     {
 #ifdef subprocesses
-#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. */