From: ceriel <none@none>
Date: Fri, 25 Oct 1991 11:18:29 +0000 (+0000)
Subject: do not depend on sys/wait.h, it does not always exist
X-Git-Tag: release-5-5~691
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=49a64df0694488844717d567c90562bc345debbb;p=ack.git

do not depend on sys/wait.h, it does not always exist
---

diff --git a/util/int/moncalls.c b/util/int/moncalls.c
index fee1fed28..7a6d955af 100644
--- a/util/int/moncalls.c
+++ b/util/int/moncalls.c
@@ -33,7 +33,6 @@ struct timeb {			/* non-existing; we use an ad-hoc definition */
 
 #ifdef	BSD4_2				/* from system.h */
 #include	<sys/time.h>
-#include	<sys/wait.h>
 #endif	BSD4_2
 
 #ifdef	SYS_V
@@ -55,11 +54,7 @@ struct timeb {			/* non-existing; we use an ad-hoc definition */
 
 #define	DUPMASK		0x40
 
-#ifdef	BSD4_2				/* from system.h */
-extern int times();
-#else
 extern long times();
-#endif	BSD4_2
 extern long lseek();
 #ifdef	SYS_V
 extern unsigned int alarm();
@@ -133,11 +128,7 @@ PRIVATE int vec();
 moncall()
 {
 	int n;				/* number actually read/written */
-#ifndef	BSD4_2				/* from system.h */
 	int status;			/* status for wait-call */
-#else	BSD4_2
-	union wait status;		/* status for wait-call */
-#endif	BSD4_2
 	int flag;			/* various flag parameters */
 	int mode;			/* various mode parameters */
 	int oldmask;			/* for umask call */
@@ -394,11 +385,7 @@ moncall()
 		}
 		else {
 			push_i2(pid);
-#ifndef	BSD4_2				/* from system.h */
 			push_i2(status);
-#else	BSD4_2
-			push_i2(status.w_status);
-#endif	BSD4_2
 			push_int(0);
 			LOG(("@m9 Wait: succeeded, status = %d, pid = %d",
 					status, pid));