X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=38167c8fdca91ddb489c52bc8d05a1cf7f01f2d5;hp=3e730cec5d8d22f1383e26fe1390d486bedd3319;hb=0c648c7c1509760370d4c4267a45a5a305885e7f;hpb=0dc22c053a80549b21709e3a518d843203b5f65d

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 3e730ce..38167c8 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -17,10 +17,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 
 /*
 ** Just use sigjmp/longjmp on older machines that
@@ -116,12 +113,7 @@ static void
 show_single_message(CT ct, char *form)
 {
 	sigset_t set, oset;
-
-#ifdef HAVE_UNION_WAIT
-	union wait status;
-#else
 	int status;
-#endif
 
 	/*
 	** Allow user executable bit so that temporary directories created by
@@ -157,11 +149,7 @@ show_single_message(CT ct, char *form)
 	SIGPROCMASK(SIG_BLOCK, &set, &oset);
 
 	while (wait(&status) != NOTOK) {
-#ifdef HAVE_UNION_WAIT
-		pidcheck(status.w_status);
-#else
 		pidcheck(status);
-#endif
 		continue;
 	}
 
@@ -739,11 +727,7 @@ show_multi_internal(CT ct, int serial, int alternate)
 	if (serial && !nowserial) {
 		pid_t pid;
 		int kids;
-#ifdef HAVE_UNION_WAIT
-		union wait status;
-#else
 		int status;
-#endif
 
 		kids = 0;
 		for (part = m->mp_parts; part; part = part->mp_next) {
@@ -758,11 +742,7 @@ show_multi_internal(CT ct, int serial, int alternate)
 		}
 
 		while (kids > 0 && (pid = wait(&status)) != NOTOK) {
-#ifdef HAVE_UNION_WAIT
-			pidcheck(status.w_status);
-#else
 			pidcheck(status);
-#endif
 
 			for (part = m->mp_parts; part; part = part->mp_next) {
 				p = part->mp_part;