X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/75e2f3fddb560b88552a93ca37d8049278665b2c..234c9cc4829d86589a079ace49cfa5bc251ef62c:/sbr/pidwait.c

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 1572bfe4..ef42e1aa 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -2,8 +2,6 @@
 /*
  * pidwait.c -- wait for child to exit
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -22,12 +20,12 @@ int
 pidwait (pid_t id, int sigsok)
 {
     pid_t pid;
-    SIGNAL_HANDLER istat, qstat;
+    SIGNAL_HANDLER istat = NULL, qstat = NULL;
 
-#ifdef WAITINT
-    int status;
-#else
+#ifdef HAVE_UNION_WAIT
     union wait status;
+#else
+    int status;
 #endif
 
     if (sigsok == -1) {
@@ -50,9 +48,9 @@ pidwait (pid_t id, int sigsok)
 	SIGNAL (SIGQUIT, qstat);
     }
 
-#ifdef WAITINT
-    return (pid == -1 ? -1 : status);
-#else
+#ifdef HAVE_UNION_WAIT
     return (pid == -1 ? -1 : status.w_status);
+#else
+    return (pid == -1 ? -1 : status);
 #endif
 }