We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.

2 files changed, 3 insertions, 41 deletions

diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 16e516ab684..4f0df962862 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.17 2002/02/17 19:42:35 millert Exp $	*/
+/*	$OpenBSD: config.h,v 1.18 2002/02/19 19:39:40 millert Exp $	*/
 /*	$NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $	*/
 
 /*
@@ -57,10 +57,8 @@
 #include <paths.h>
 #endif /* ...BSD */
 
-#ifdef __STDC__
 #include <stdlib.h>
 #include <unistd.h>
-#endif
 
 /* These are really for MAKE_BOOTSTRAP but harmless. */
 #ifndef __dead
diff --git a/usr.sbin/config/util.c b/usr.sbin/config/util.c
index 699ae2acfba..02171718044 100644
--- a/usr.sbin/config/util.c
+++ b/usr.sbin/config/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.7 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: util.c,v 1.8 2002/02/19 19:39:40 millert Exp $	*/
 /*	$NetBSD: util.c,v 1.5 1996/08/31 20:58:29 mycroft Exp $	*/
 
 /*
@@ -45,16 +45,12 @@
  *	from: @(#)util.c	8.1 (Berkeley) 6/6/93
  */
 
+#include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include <sys/types.h>
 #include "config.h"
 
 static void nomem(void);
@@ -172,22 +168,12 @@ nvfreel(nv)
  * and line number.
  */
 void
-#ifdef __STDC__
 error(const char *fmt, ...)
-#else
-error(fmt, va_alist)
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 	extern const char *yyfile;
 
-#ifdef __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	vxerror(yyfile, currentline(), fmt, ap);
 	va_end(ap);
 }
@@ -197,23 +183,11 @@ error(fmt, va_alist)
  * find out about it until later).
  */
 void
-#ifdef __STDC__
 xerror(const char *file, int line, const char *fmt, ...)
-#else
-xerror(file, line, fmt, va_alist)
-	const char *file;
-	int line;
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#ifdef __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	vxerror(file, line, fmt, ap);
 	va_end(ap);
 }
@@ -239,21 +213,11 @@ vxerror(file, line, fmt, ap)
  * Internal error, abort.
  */
 __dead void
-#ifdef __STDC__
 panic(const char *fmt, ...)
-#else
-panic(fmt, va_alist)
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#ifdef __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)fprintf(stderr, "config: panic: ");
 	(void)vfprintf(stderr, fmt, ap);
 	(void)putc('\n', stderr);