Don't use waitid(), after all.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index f100501d63dd3879811aec7029dd4279ecc8951e..1a604ea770b9db3a0f19d86bc9b75c3956045867 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-17  Bruno Haible  <bruno@clisp.org>
+
+       * wait-process.c (wait_process): Disable the 2003-10-31 waitid() patch.
+
 2003-11-16  Bruno Haible  <bruno@clisp.org>
 
        * xsize.h (xmax): New function.

diff --git a/gettext-tools/lib/wait-process.c b/gettext-tools/lib/wait-process.c
index 26a889ca48f8bbf8645b555de6872a9b0fd16115..98891654984dd73a6216aa7ce053390244fb18f4 100644 (file)
--- a/gettext-tools/lib/wait-process.c
+++ b/gettext-tools/lib/wait-process.c
@@ -252,7 +252,10 @@ wait_subprocess (pid_t child, const char *progname,
                 bool null_stderr,
                 bool slave_process, bool exit_on_error)
 {
-#if HAVE_WAITID && defined WNOWAIT
+#if HAVE_WAITID && defined WNOWAIT && 0
+  /* Commented out because waitid() with WNOWAIT doesn't work: On Solaris 7
+     and OSF/1 4.0, it returns -1 and sets errno = ECHILD, and on HP-UX 10.20
+     it just hangs.  */
   /* Use of waitid() with WNOWAIT avoids a race condition: If slave_process is
      true, and this process sleeps a very long time between the return from
      waitpid() and the execution of unregister_slave_subprocess(), and