X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=a63b8ed428bbf85315444680d84d59012637378f;hb=93f22073ff22b277206b0481c1f8f076aee1656d;hp=e28c73ea655cb6dba325696176d2acbaa8a113f8;hpb=55b8f7b6a738adb4dc9833233fc6111f3cd56969;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index e28c73e..a63b8ed 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -2,8 +2,6 @@
 /*
  * mhshowsbr.c -- routines to display the contents of MIME messages
  *
- * $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.
@@ -134,10 +132,10 @@ show_single_message (CT ct, char *form)
 {
     sigset_t set, oset;
 
-#ifdef WAITINT
-    int status;
-#else
+#ifdef HAVE_UNION_WAIT
     union wait status;
+#else
+    int status;
 #endif
 
     /* Allow user executable bit so that temporary directories created by
@@ -172,10 +170,10 @@ show_single_message (CT ct, char *form)
     SIGPROCMASK (SIG_BLOCK, &set, &oset);
 
     while (wait (&status) != NOTOK) {
-#ifdef WAITINT
-	pidcheck (status);
-#else
+#ifdef HAVE_UNION_WAIT
 	pidcheck (status.w_status);
+#else
+	pidcheck (status);
 #endif
 	continue;
     }
@@ -785,10 +783,10 @@ show_multi_internal (CT ct, int serial, int alternate)
     if (serial && !nowserial) {
 	pid_t pid;
 	int kids;
-#ifdef WAITINT
-	int status;
-#else
+#ifdef HAVE_UNION_WAIT
 	union wait status;
+#else
+	int status;
 #endif
 
 	kids = 0;
@@ -804,10 +802,10 @@ show_multi_internal (CT ct, int serial, int alternate)
 	}
 
 	while (kids > 0 && (pid = wait (&status)) != NOTOK) {
-#ifdef WAITINT
-	    pidcheck (status);
-#else
+#ifdef HAVE_UNION_WAIT
 	    pidcheck (status.w_status);
+#else
+	    pidcheck (status);
 #endif
 
 	    for (part = m->mp_parts; part; part = part->mp_next) {