From a7909ab462c395e8a671147fc801b7426b1273f5 Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Sat, 6 Aug 2011 19:53:24 +0000
Subject: <sys/wait.h> is standard, so just use it instead of fiddling about
 with ifdefs for long-dead systems. While here, remove union wait.

---
 hack/config.h     |  3 +--
 hack/hack.pager.c | 24 +++---------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

(limited to 'hack')

diff --git a/hack/config.h b/hack/config.h
index 18c5caba..7f51a842 100644
--- a/hack/config.h
+++ b/hack/config.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: config.h,v 1.9 2011/08/06 19:47:54 dholland Exp $	*/
+/*	$NetBSD: config.h,v 1.10 2011/08/06 19:53:24 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -83,7 +83,6 @@
 
 /* #define STUPID */	/* avoid some complicated expressions if
 			   your C compiler chokes on them */
-/* #define NOWAITINCLUDE */	/* neither <wait.h> nor <sys/wait.h> exists */
 
 #define WIZARD  "bruno"	/* the person allowed to use the -D option */
 #define RECORD	"record"/* the file containing the list of topscorers */
diff --git a/hack/hack.pager.c b/hack/hack.pager.c
index dca670d8..2043b919 100644
--- a/hack/hack.pager.c
+++ b/hack/hack.pager.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.pager.c,v 1.15 2011/05/23 22:53:25 joerg Exp $	*/
+/*	$NetBSD: hack.pager.c,v 1.16 2011/08/06 19:53:24 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.pager.c,v 1.15 2011/05/23 22:53:25 joerg Exp $");
+__RCSID("$NetBSD: hack.pager.c,v 1.16 2011/08/06 19:53:24 dholland Exp $");
 #endif				/* not lint */
 
 /* This file contains the command routine dowhatis() and a pager. */
@@ -73,6 +73,7 @@ __RCSID("$NetBSD: hack.pager.c,v 1.15 2011/05/23 22:53:25 joerg Exp $");
  */
 
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -438,25 +439,6 @@ dosh(void)
 }
 #endif	/* SHELL */
 
-#ifdef NOWAITINCLUDE
-union wait {			/* used only for the cast  (union wait *) 0  */
-	int             w_status;
-	struct {
-		unsigned short  w_Termsig:7;
-		unsigned short  w_Coredump:1;
-		unsigned short  w_Retcode:8;
-	}               w_T;
-};
-
-#else
-
-#ifdef BSD
-#include	<sys/wait.h>
-#else
-#include	<wait.h>
-#endif	/* BSD */
-#endif	/* NOWAITINCLUDE */
-
 static int
 child(int wt)
 {
-- 
cgit v1.2.3-56-ge451