* Bug #15213, #18635: The use of the insecure m_scratch() and

[mmh] / sbr / pidwait.c

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 1572bfe..607538f 100644 (file)
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -22,12 +22,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 +50,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
 }