__STDC__ is always defined on NetBSD.

5 files changed, 12 insertions, 58 deletions

diff --git a/hack/extern.h b/hack/extern.h
index 325531b8..804498cc 100644
--- a/hack/extern.h
+++ b/hack/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.4 2001/03/25 20:43:58 jsm Exp $	*/
+/*	$NetBSD: extern.h,v 1.5 2002/05/26 00:12:12 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,12 +37,8 @@
  */
 #ifndef _EXTERN_H_
 #define _EXTERN_H_
-#include <stdio.h>
-#ifndef __STDC__
-#include <varargs.h>
-#else
 #include <stdarg.h>
-#endif
+#include <stdio.h>
 
 /* alloc.c */
 long *alloc __P((unsigned));
diff --git a/hack/hack.main.c b/hack/hack.main.c
index 6c0e7491..37696818 100644
--- a/hack/hack.main.c
+++ b/hack/hack.main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.main.c,v 1.6 2001/03/25 20:44:01 jsm Exp $	*/
+/*	$NetBSD: hack.main.c,v 1.7 2002/05/26 00:12:12 wiz Exp $	*/
 
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
@@ -6,7 +6,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.main.c,v 1.6 2001/03/25 20:44:01 jsm Exp $");
+__RCSID("$NetBSD: hack.main.c,v 1.7 2002/05/26 00:12:12 wiz Exp $");
 #endif				/* not lint */
 
 #include <signal.h>
@@ -466,22 +466,11 @@ askname()
 
 /* VARARGS1 */
 void
-#ifdef __STDC__
 impossible(const char *s, ...)
-#else
-impossible(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
-#ifndef __STDC__
-	const char           *s;
 
-	va_start(ap);
-	s = va_arg(ap, const char *);
-#else
 	va_start(ap, s);
-#endif
 	vpline(s, ap);
 	va_end(ap);
 	pline("Program in disorder - perhaps you'd better Quit.");
diff --git a/hack/hack.pri.c b/hack/hack.pri.c
index 826b2599..ea30cd57 100644
--- a/hack/hack.pri.c
+++ b/hack/hack.pri.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.pri.c,v 1.6 2001/03/25 20:44:02 jsm Exp $	*/
+/*	$NetBSD: hack.pri.c,v 1.7 2002/05/26 00:12:12 wiz Exp $	*/
 
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
@@ -6,7 +6,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.pri.c,v 1.6 2001/03/25 20:44:02 jsm Exp $");
+__RCSID("$NetBSD: hack.pri.c,v 1.7 2002/05/26 00:12:12 wiz Exp $");
 #endif				/* not lint */
 
 #include "hack.h"
@@ -40,21 +40,11 @@ swallowed()
 boolean         panicking;
 
 void
-#ifdef __STDC__
 panic(const char *fmt, ...)
-#else
-panic(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
-#ifndef __STDC__
-	const char *fmt;
-	va_start(ap);
-	fmt = va_arg(ap, const char *);
-#else
+
 	va_start(ap, fmt);
-#endif
 	if (panicking++)
 		exit(1);	/* avoid loops - this should never happen */
 	home();
diff --git a/hack/hack.topl.c b/hack/hack.topl.c
index 53a0bea0..ff32e307 100644
--- a/hack/hack.topl.c
+++ b/hack/hack.topl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.topl.c,v 1.5 2001/03/25 20:44:03 jsm Exp $	*/
+/*	$NetBSD: hack.topl.c,v 1.6 2002/05/26 00:12:12 wiz Exp $	*/
 
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
@@ -6,7 +6,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.topl.c,v 1.5 2001/03/25 20:44:03 jsm Exp $");
+__RCSID("$NetBSD: hack.topl.c,v 1.6 2002/05/26 00:12:12 wiz Exp $");
 #endif				/* not lint */
 
 #include <stdlib.h>
@@ -143,21 +143,11 @@ clrlin()
 }
 
 void
-#ifdef __STDC__
 pline(const char *fmt, ...)
-#else
-pline(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
-#ifndef __STDC__
-	const char *fmt;
-	va_start(ap);
-	fmt = va_arg(ap, const char *);
-#else
+
 	va_start(ap, fmt);
-#endif
 	vpline(fmt, ap);
 	va_end(ap);
 }
diff --git a/hack/hack.tty.c b/hack/hack.tty.c
index 93831ce1..15a17d4c 100644
--- a/hack/hack.tty.c
+++ b/hack/hack.tty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.tty.c,v 1.9 2001/03/25 20:44:03 jsm Exp $	*/
+/*	$NetBSD: hack.tty.c,v 1.10 2002/05/26 00:12:12 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char     sccsid[] = "@(#)hack.tty.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: hack.tty.c,v 1.9 2001/03/25 20:44:03 jsm Exp $");
+__RCSID("$NetBSD: hack.tty.c,v 1.10 2002/05/26 00:12:12 wiz Exp $");
 #endif
 #endif				/* not lint */
 
@@ -143,22 +143,11 @@ setftty()
 /* fatal error */
 /* VARARGS1 */
 void
-#ifdef __STDC__
 error(const char *fmt, ...)
-#else
-error(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
-#ifndef __STDC__
-	const char *fmt;
 
-	va_start(ap);
-	fmt = va_arg(ap, const char *);
-#else
 	va_start(ap, fmt);
-#endif
 	if (settty_needed)
 		settty((char *) 0);
 	vprintf(fmt, ap);