From 077b67effadb22ff159d23ade2acfe9aafe6a530 Mon Sep 17 00:00:00 2001
From: wiz <wiz@NetBSD.org>
Date: Sun, 26 May 2002 14:03:19 +0000
Subject: [PATCH] __STDC__ is always defined on NetBSD.

---
 lib/libc/gen/err.c          | 24 +++---------------------
 lib/libc/gen/errx.c         | 24 +++---------------------
 lib/libc/gen/execl.c        | 24 +++++-------------------
 lib/libc/gen/execle.c       | 26 ++++++--------------------
 lib/libc/gen/execlp.c       | 24 +++++-------------------
 lib/libc/gen/getnetgrent.c  | 11 +++--------
 lib/libc/gen/getpwent.c     | 11 +++--------
 lib/libc/gen/getusershell.c | 11 +++--------
 lib/libc/gen/setproctitle.c | 21 +++------------------
 lib/libc/gen/syslog.c       | 22 +++-------------------
 lib/libc/gen/ulimit.c       | 21 +++------------------
 lib/libc/gen/verr.c         | 11 +++--------
 lib/libc/gen/verrx.c        | 11 +++--------
 lib/libc/gen/vis.c          |  8 ++------
 lib/libc/gen/vwarn.c        | 11 +++--------
 lib/libc/gen/vwarnx.c       | 11 +++--------
 lib/libc/gen/waitpid.c      | 11 ++---------
 lib/libc/gen/warn.c         | 22 +++-------------------
 lib/libc/gen/warnx.c        | 24 ++++--------------------
 19 files changed, 63 insertions(+), 265 deletions(-)

diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 8ca2a9e3b7e7..301fc11e1e4b 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: err.c,v 1.20 2002/04/22 23:31:44 bjh21 Exp $	*/
+/*	$NetBSD: err.c,v 1.21 2002/05/26 14:03:19 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: err.c,v 1.20 2002/04/22 23:31:44 bjh21 Exp $");
+__RCSID("$NetBSD: err.c,v 1.21 2002/05/26 14:03:19 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -49,36 +49,18 @@ __RCSID("$NetBSD: err.c,v 1.20 2002/04/22 23:31:44 bjh21 Exp $");
 #include "config.h"
 #endif
 #include <err.h>
-
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #ifdef __weak_alias
 __weak_alias(err, _err)
 #endif
 
 __dead void
-#ifdef __STDC__
 _err(int eval, const char *fmt, ...)
-#else
-_err(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
-#ifdef __STDC__
-	va_start(ap, fmt);
-#else
-	int eval;
-	const char *fmt;
 
-	va_start(ap);
-	eval = va_arg(ap, int);
-	fmt = va_arg(ap, const char *);
-#endif
+	va_start(ap, fmt);
 	_verr(eval, fmt, ap);
 	va_end(ap);
 }
diff --git a/lib/libc/gen/errx.c b/lib/libc/gen/errx.c
index dfb199add801..3b6bc0b94199 100644
--- a/lib/libc/gen/errx.c
+++ b/lib/libc/gen/errx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: errx.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $	*/
+/*	$NetBSD: errx.c,v 1.9 2002/05/26 14:03:19 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: errx.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $");
+__RCSID("$NetBSD: errx.c,v 1.9 2002/05/26 14:03:19 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -49,36 +49,18 @@ __RCSID("$NetBSD: errx.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $");
 #include "config.h"
 #endif
 #include <err.h>
-
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #ifdef __weak_alias
 __weak_alias(errx, _errx)
 #endif
 
 __dead void
-#ifdef __STDC__
 _errx(int eval, const char *fmt, ...)
-#else
-_errx(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
-#ifdef __STDC__
-	va_start(ap, fmt);
-#else
-	int eval;
-	const char *fmt;
 
-	va_start(ap);
-	eval = va_arg(ap, int);
-	fmt = va_arg(ap, const char *);
-#endif
+	va_start(ap, fmt);
 	_verrx(eval, fmt, ap);
 	va_end(ap);
 }
diff --git a/lib/libc/gen/execl.c b/lib/libc/gen/execl.c
index 35d90ea571d2..feb623a6b16f 100644
--- a/lib/libc/gen/execl.c
+++ b/lib/libc/gen/execl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: execl.c,v 1.7 2000/01/22 22:19:09 mycroft Exp $	*/
+/*	$NetBSD: execl.c,v 1.8 2002/05/26 14:03:19 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -38,23 +38,16 @@
 #if 0
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: execl.c,v 1.7 2000/01/22 22:19:09 mycroft Exp $");
+__RCSID("$NetBSD: execl.c,v 1.8 2002/05/26 14:03:19 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
+#include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include "reentrant.h"
 
-#if __STDC__
-#include <stdarg.h>
-#define VA_START(ap, last)	va_start(ap, last)
-#else
-#include <varargs.h>
-#define VA_START(ap, last)	va_start(ap)
-#endif
-
 #ifdef __weak_alias
 __weak_alias(execl,_execl)
 #endif
@@ -66,14 +59,7 @@ extern rwlock_t __environ_lock;
 #endif
 
 int
-#if __STDC__
 execl(const char *name, const char *arg, ...)
-#else
-execl(name, arg, va_alist)
-	const char *name;
-	const char *arg;
-	va_dcl
-#endif
 {
 	int r;
 #if defined(__i386__) || defined(__m68k__) || defined(__ns32k__)
@@ -86,14 +72,14 @@ execl(name, arg, va_alist)
 	char **argv;
 	int i;
 
-	VA_START(ap, arg);
+	va_start(ap, arg);
 	for (i = 2; va_arg(ap, char *) != NULL; i++)
 		;
 	va_end(ap);
 
 	argv = alloca (i * sizeof (char *));
 	
-	VA_START(ap, arg);
+	va_start(ap, arg);
 	argv[0] = (char *) arg;
 	for (i = 1; (argv[i] = (char *) va_arg(ap, char *)) != NULL; i++) 
 		;
diff --git a/lib/libc/gen/execle.c b/lib/libc/gen/execle.c
index 07e89f126c29..e4ce52ca4d37 100644
--- a/lib/libc/gen/execle.c
+++ b/lib/libc/gen/execle.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: execle.c,v 1.6 2000/01/22 22:19:09 mycroft Exp $	*/
+/*	$NetBSD: execle.c,v 1.7 2002/05/26 14:03:19 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -38,41 +38,27 @@
 #if 0
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: execle.c,v 1.6 2000/01/22 22:19:09 mycroft Exp $");
+__RCSID("$NetBSD: execle.c,v 1.7 2002/05/26 14:03:19 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
+#include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#if __STDC__
-#include <stdarg.h>
-#define VA_START(ap, last)	va_start(ap, last)
-#else
-#include <varargs.h>
-#define VA_START(ap, last)	va_start(ap)
-#endif
-
 #ifdef __weak_alias
 __weak_alias(execle,_execle)
 #endif
 
 int
-#if __STDC__
 execle(const char *name, const char *arg, ...)
-#else
-execle(name, arg, va_alist)
-	const char *name;
-	const char *arg;
-	va_dcl
-#endif
 {
 #if defined(__i386__) || defined(__m68k__) || defined(__ns32k__)
 	va_list ap;
 	char **envp;
 
-	VA_START(ap, arg);
+	va_start(ap, arg);
 	while ((va_arg(ap, char *)) != NULL)
 		;
 	envp = va_arg(ap, char **);
@@ -84,14 +70,14 @@ execle(name, arg, va_alist)
 	char **argv, **envp;
 	int i;
 
-	VA_START(ap, arg);
+	va_start(ap, arg);
 	for (i = 2; va_arg(ap, char *) != NULL; i++)
 		;
 	va_end(ap);
 
 	argv = alloca (i * sizeof (char *));
 	
-	VA_START(ap, arg);
+	va_start(ap, arg);
 	argv[0] = (char *) arg;
 	for (i = 1; (argv[i] = (char *) va_arg(ap, char *)) != NULL; i++) 
 		;
diff --git a/lib/libc/gen/execlp.c b/lib/libc/gen/execlp.c
index d7927fd40563..098142c6fd5a 100644
--- a/lib/libc/gen/execlp.c
+++ b/lib/libc/gen/execlp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: execlp.c,v 1.6 2000/01/22 22:19:09 mycroft Exp $	*/
+/*	$NetBSD: execlp.c,v 1.7 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -38,35 +38,21 @@
 #if 0
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: execlp.c,v 1.6 2000/01/22 22:19:09 mycroft Exp $");
+__RCSID("$NetBSD: execlp.c,v 1.7 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
+#include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#if __STDC__
-#include <stdarg.h>
-#define VA_START(ap, last)	va_start(ap, last)
-#else
-#include <varargs.h>
-#define VA_START(ap, last)	va_start(ap)
-#endif
-
 #ifdef __weak_alias
 __weak_alias(execlp,_execlp)
 #endif
 
 int
-#if __STDC__
 execlp(const char *name, const char *arg, ...)
-#else
-execlp(name, arg, va_alist)
-	const char *name;
-	const char *arg;
-	va_dcl
-#endif
 {
 #if defined(__i386__) || defined(__m68k__) || defined(__ns32k__)
 	return execvp(name, (char **) &arg);
@@ -75,14 +61,14 @@ execlp(name, arg, va_alist)
 	char **argv;
 	int i;
 
-	VA_START(ap, arg);
+	va_start(ap, arg);
 	for (i = 2; va_arg(ap, char *) != NULL; i++)
 		;
 	va_end(ap);
 
 	argv = alloca (i * sizeof (char *));
 	
-	VA_START(ap, arg);
+	va_start(ap, arg);
 	argv[0] = (char *) arg;
 	for (i = 1; (argv[i] = va_arg(ap, char *)) != NULL; i++) 
 		;
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 737c23f5a582..62fd23b487b2 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getnetgrent.c,v 1.28 2000/01/22 22:40:58 mycroft Exp $	*/
+/*	$NetBSD: getnetgrent.c,v 1.29 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnetgrent.c,v 1.28 2000/01/22 22:40:58 mycroft Exp $");
+__RCSID("$NetBSD: getnetgrent.c,v 1.29 2002/05/26 14:03:20 wiz Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -47,6 +47,7 @@ __RCSID("$NetBSD: getnetgrent.c,v 1.28 2000/01/22 22:40:58 mycroft Exp $");
 #define _NETGROUP_PRIVATE
 #include <netgroup.h>
 #include <nsswitch.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -58,12 +59,6 @@ __RCSID("$NetBSD: getnetgrent.c,v 1.28 2000/01/22 22:40:58 mycroft Exp $");
 #include <rpcsvc/yp_prot.h>
 #endif
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
- 
 #ifdef __weak_alias
 __weak_alias(endnetgrent,_endnetgrent)
 __weak_alias(getnetgrent,_getnetgrent)
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 5cf1e4cf8168..550424c7dd1c 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getpwent.c,v 1.50 2002/04/16 19:10:07 groo Exp $	*/
+/*	$NetBSD: getpwent.c,v 1.51 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)getpwent.c	8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: getpwent.c,v 1.50 2002/04/16 19:10:07 groo Exp $");
+__RCSID("$NetBSD: getpwent.c,v 1.51 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -54,6 +54,7 @@ __RCSID("$NetBSD: getpwent.c,v 1.50 2002/04/16 19:10:07 groo Exp $");
 #include <netgroup.h>
 #include <nsswitch.h>
 #include <pwd.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
@@ -71,12 +72,6 @@ __RCSID("$NetBSD: getpwent.c,v 1.50 2002/04/16 19:10:07 groo Exp $");
 #include <rpcsvc/ypclnt.h>
 #endif
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 #include "pw_private.h"
 
 #if defined(YP) || defined(HESIOD)
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index 8e26e95bd6fb..4e9f23c71d8c 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getusershell.c,v 1.21 2000/07/07 08:03:37 itohy Exp $	*/
+/*	$NetBSD: getusershell.c,v 1.22 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*
  * Copyright (c) 1985, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)getusershell.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: getusershell.c,v 1.21 2000/07/07 08:03:37 itohy Exp $");
+__RCSID("$NetBSD: getusershell.c,v 1.22 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -50,18 +50,13 @@ __RCSID("$NetBSD: getusershell.c,v 1.21 2000/07/07 08:03:37 itohy Exp $");
 #include <errno.h>
 #include <nsswitch.h>
 #include <paths.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stringlist.h>
 #include <unistd.h>
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 #ifdef HESIOD
 #include <hesiod.h>
 #endif
diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
index 15b5d9319cd4..9aed0e122227 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setproctitle.c,v 1.19 2001/02/19 22:22:16 cgd Exp $ */
+/* $NetBSD: setproctitle.c,v 1.20 2002/05/26 14:03:20 wiz Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Christopher G. Demetriou
@@ -36,23 +36,18 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setproctitle.c,v 1.19 2001/02/19 22:22:16 cgd Exp $");
+__RCSID("$NetBSD: setproctitle.c,v 1.20 2002/05/26 14:03:20 wiz Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/exec.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 #ifdef __weak_alias
 __weak_alias(setproctitle,_setproctitle)
 #endif
@@ -66,23 +61,13 @@ __weak_alias(setproctitle,_setproctitle)
 struct ps_strings *__ps_strings;
 
 void
-#if __STDC__
 setproctitle(const char *fmt, ...)
-#else
-setproctitle(fmt, va_alist)
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 	static char buf[MAX_PROCTITLE], *bufp;
 	int used;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	if (fmt != NULL) {
 		used = snprintf(buf, (size_t)MAX_PROCTITLE, "%s: ",
 		    getprogname());
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index c872a3f08255..d5e051b30d23 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: syslog.c,v 1.27 2001/07/30 04:12:33 atatat Exp $	*/
+/*	$NetBSD: syslog.c,v 1.28 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
 #else
-__RCSID("$NetBSD: syslog.c,v 1.27 2001/07/30 04:12:33 atatat Exp $");
+__RCSID("$NetBSD: syslog.c,v 1.28 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,6 +53,7 @@ __RCSID("$NetBSD: syslog.c,v 1.27 2001/07/30 04:12:33 atatat Exp $");
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -60,12 +61,6 @@ __RCSID("$NetBSD: syslog.c,v 1.27 2001/07/30 04:12:33 atatat Exp $");
 #include <unistd.h>
 #include "reentrant.h"
 
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 #ifdef __weak_alias
 __weak_alias(closelog,_closelog)
 __weak_alias(openlog,_openlog)
@@ -99,22 +94,11 @@ static const int ZERO = 0;
  *	print message on log file; output is intended for syslogd(8).
  */
 void
-#if __STDC__
 syslog(int pri, const char *fmt, ...)
-#else
-syslog(pri, fmt, va_alist)
-	int pri;
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	vsyslog(pri, fmt, ap);
 	va_end(ap);
 }
diff --git a/lib/libc/gen/ulimit.c b/lib/libc/gen/ulimit.c
index f277da275544..235369978ce4 100644
--- a/lib/libc/gen/ulimit.c
+++ b/lib/libc/gen/ulimit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ulimit.c,v 1.1 1999/09/13 18:38:06 kleink Exp $	*/
+/*	$NetBSD: ulimit.c,v 1.2 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,37 +38,22 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ulimit.c,v 1.1 1999/09/13 18:38:06 kleink Exp $");
+__RCSID("$NetBSD: ulimit.c,v 1.2 2002/05/26 14:03:20 wiz Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/resource.h>
 #include <errno.h>
+#include <stdarg.h>
 #include <ulimit.h>
 
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 long int
-#if __STDC__
 ulimit(int cmd, ...)
-#else
-ulimit(cmd, va_alist)
-	int cmd;
-	va_dcl
-#endif
 {
 	va_list ap;
 	struct rlimit rlimit;
 	long int new_limit, result;
 
-#if __STDC__
 	va_start(ap, cmd);
-#else
-	va_start(ap);
-#endif
 
 	result = -1L;
 	switch (cmd) {
diff --git a/lib/libc/gen/verr.c b/lib/libc/gen/verr.c
index 780cbe7ccebf..756ec2b6f645 100644
--- a/lib/libc/gen/verr.c
+++ b/lib/libc/gen/verr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: verr.c,v 1.9 2002/01/31 22:43:38 tv Exp $	*/
+/*	$NetBSD: verr.c,v 1.10 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: verr.c,v 1.9 2002/01/31 22:43:38 tv Exp $");
+__RCSID("$NetBSD: verr.c,v 1.10 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -50,16 +50,11 @@ __RCSID("$NetBSD: verr.c,v 1.9 2002/01/31 22:43:38 tv Exp $");
 #endif
 #include <err.h>
 #include <errno.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 #ifdef __weak_alias
 __weak_alias(verr, _verr)
 #endif
diff --git a/lib/libc/gen/verrx.c b/lib/libc/gen/verrx.c
index a9672d256315..ca45d5ad753f 100644
--- a/lib/libc/gen/verrx.c
+++ b/lib/libc/gen/verrx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: verrx.c,v 1.9 2002/01/31 22:43:38 tv Exp $	*/
+/*	$NetBSD: verrx.c,v 1.10 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: verrx.c,v 1.9 2002/01/31 22:43:38 tv Exp $");
+__RCSID("$NetBSD: verrx.c,v 1.10 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -49,15 +49,10 @@ __RCSID("$NetBSD: verrx.c,v 1.9 2002/01/31 22:43:38 tv Exp $");
 #include "config.h"
 #endif
 #include <err.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 #ifdef __weak_alias
 __weak_alias(verrx, _verrx)
 #endif
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
index 9021147c8a73..b0a3bd4e8b0e 100644
--- a/lib/libc/gen/vis.c
+++ b/lib/libc/gen/vis.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vis.c,v 1.22 2002/03/23 17:38:27 christos Exp $	*/
+/*	$NetBSD: vis.c,v 1.23 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.22 2002/03/23 17:38:27 christos Exp $");
+__RCSID("$NetBSD: vis.c,v 1.23 2002/05/26 14:03:20 wiz Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -62,11 +62,7 @@ __weak_alias(vis,_vis)
 #include <string.h>
 
 #undef BELL
-#if defined(__STDC__)
 #define BELL '\a'
-#else
-#define BELL '\007'
-#endif
 
 #define isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
 #define iswhite(c)	(c == ' ' || c == '\t' || c == '\n')
diff --git a/lib/libc/gen/vwarn.c b/lib/libc/gen/vwarn.c
index a46fb34d7e18..78f2c30c05dd 100644
--- a/lib/libc/gen/vwarn.c
+++ b/lib/libc/gen/vwarn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vwarn.c,v 1.9 2002/01/31 22:43:39 tv Exp $	*/
+/*	$NetBSD: vwarn.c,v 1.10 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vwarn.c,v 1.9 2002/01/31 22:43:39 tv Exp $");
+__RCSID("$NetBSD: vwarn.c,v 1.10 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -50,16 +50,11 @@ __RCSID("$NetBSD: vwarn.c,v 1.9 2002/01/31 22:43:39 tv Exp $");
 #endif
 #include <err.h>
 #include <errno.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 #ifdef __weak_alias
 __weak_alias(vwarn, _vwarn)
 #endif
diff --git a/lib/libc/gen/vwarnx.c b/lib/libc/gen/vwarnx.c
index dbc8192a9c47..cc5fde3c9516 100644
--- a/lib/libc/gen/vwarnx.c
+++ b/lib/libc/gen/vwarnx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vwarnx.c,v 1.9 2002/01/31 22:43:39 tv Exp $	*/
+/*	$NetBSD: vwarnx.c,v 1.10 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vwarnx.c,v 1.9 2002/01/31 22:43:39 tv Exp $");
+__RCSID("$NetBSD: vwarnx.c,v 1.10 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -49,15 +49,10 @@ __RCSID("$NetBSD: vwarnx.c,v 1.9 2002/01/31 22:43:39 tv Exp $");
 #include "config.h"
 #endif
 #include <err.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 #ifdef __weak_alias
 __weak_alias(vwarnx, _vwarnx)
 #endif
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index d820f56d4541..1ac1cd61d3ea 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: waitpid.c,v 1.7 2000/01/22 22:19:13 mycroft Exp $	*/
+/*	$NetBSD: waitpid.c,v 1.8 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)waitpid.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: waitpid.c,v 1.7 2000/01/22 22:19:13 mycroft Exp $");
+__RCSID("$NetBSD: waitpid.c,v 1.8 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,14 +53,7 @@ __weak_alias(waitpid,_waitpid)
 #endif
 
 pid_t
-#if __STDC__
 waitpid(pid_t pid, int *istat, int options)
-#else
-waitpid(pid, istat, options)
-	pid_t pid;
-	int *istat;
-	int options;
-#endif
 {
 	return (wait4(pid, istat, options, (struct rusage *)0));
 }
diff --git a/lib/libc/gen/warn.c b/lib/libc/gen/warn.c
index 3544d0d5a67e..c12c503c20ab 100644
--- a/lib/libc/gen/warn.c
+++ b/lib/libc/gen/warn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: warn.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $	*/
+/*	$NetBSD: warn.c,v 1.9 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: warn.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $");
+__RCSID("$NetBSD: warn.c,v 1.9 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -49,34 +49,18 @@ __RCSID("$NetBSD: warn.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $");
 #include "config.h"
 #endif
 #include <err.h>
-
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #ifdef __weak_alias
 __weak_alias(warn, _warn)
 #endif
 
 void
-#ifdef __STDC__
 _warn(const char *fmt, ...)
-#else
-_warn(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
-#ifdef __STDC__
-	va_start(ap, fmt);
-#else
-	const char *fmt;
 
-	va_start(ap);
-	fmt = va_arg(ap, const char *);
-#endif
+	va_start(ap, fmt);
 	_vwarn(fmt, ap);
 	va_end(ap);
 }
diff --git a/lib/libc/gen/warnx.c b/lib/libc/gen/warnx.c
index f12bfbaae7aa..a985b2de2106 100644
--- a/lib/libc/gen/warnx.c
+++ b/lib/libc/gen/warnx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: warnx.c,v 1.7 2002/01/31 22:43:39 tv Exp $	*/
+/*	$NetBSD: warnx.c,v 1.8 2002/05/26 14:03:20 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: warnx.c,v 1.7 2002/01/31 22:43:39 tv Exp $");
+__RCSID("$NetBSD: warnx.c,v 1.8 2002/05/26 14:03:20 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -49,34 +49,18 @@ __RCSID("$NetBSD: warnx.c,v 1.7 2002/01/31 22:43:39 tv Exp $");
 #include "config.h"
 #endif
 #include <err.h>
-
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #ifdef __weak_alias
 __weak_alias(warnx, _warnx)
 #endif
 
 void
-#ifdef __STDC__
-_warnx(const char *fmt, ...)
-#else
-_warnx(va_alist)
-	va_dcl
-#endif
+warnx(const char *fmt, ...)
 {
 	va_list ap;
-#ifdef __STDC__
-	va_start(ap, fmt);
-#else
-	const char *fmt;
 
-	va_start(ap);
-	fmt = va_arg(ap, const char *);
-#endif
+	va_start(ap, fmt);
 	_vwarnx(fmt, ap);
 	va_end(ap);
 }