4 files changed, 0 insertions, 60 deletions

diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index 5818cd7b8c01..a61bba3e87bb 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -534,28 +534,13 @@ trstat_write(struct printer *pp, tr_sendrecv sendrecv, size_t bytecnt,
 #undef UPD_EOSTAT	
 }
 
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 void
-#ifdef __STDC__
 fatal(const struct printer *pp, const char *msg, ...)
-#else
-fatal(pp, msg, va_alist)
-	const struct printer *pp;
-	char *msg;
-        va_dcl
-#endif
 {
 	va_list ap;
-#ifdef __STDC__
 	va_start(ap, msg);
-#else
-	va_start(ap);
-#endif
 	/* this error message is being sent to the 'from_host' */
 	if (from_host != local_host)
 		(void)printf("%s: ", local_host);
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 59ccccb1124b..876584bfc5a8 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1846,30 +1846,15 @@ setty(const struct printer *pp)
 	}
 }
 
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 static void
-#ifdef __STDC__
 pstatus(const struct printer *pp, const char *msg, ...)
-#else
-pstatus(pp, msg, va_alist)
-	const struct printer *pp;
-	char *msg;
-        va_dcl
-#endif
 {
 	int fd;
 	char *buf;
 	va_list ap;
-#ifdef __STDC__
 	va_start(ap, msg);
-#else
-	va_start(ap);
-#endif
 
 	umask(0);
 	fd = open(pp->status_file, O_WRONLY|O_CREAT|O_EXLOCK, STAT_FILE_MODE);
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index d9f97bf51316..69a654d8b240 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -372,27 +372,13 @@ rcleanup(int signo __unused)
 	dfname[0] = '\0';
 }
 
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 static void
-#ifdef __STDC__
 frecverr(const char *msg, ...)
-#else
-frecverr(msg, va_alist)
-	char *msg;
-        va_dcl
-#endif
 {
 	va_list ap;
-#ifdef __STDC__
 	va_start(ap, msg);
-#else
-	va_start(ap);
-#endif
 	syslog(LOG_ERR, "Error receiving job from %s:", from_host);
 	vsyslog(LOG_ERR, msg, ap);
 	va_end(ap);
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 622afdf5519c..2975fb5b49a5 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -406,30 +406,14 @@ dsort(a, b)
 	return (strcmp((*a)->fts_name, (*b)->fts_name));
 }
 
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 void
-#if __STDC__
 output(int indent, int *offset, const char *fmt, ...)
-#else
-output(indent, offset, fmt, va_alist)
-	int indent;
-	int *offset;
-	char *fmt;
-        va_dcl
-#endif
 {
 	va_list ap;
 	char buf[1024];
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)vsnprintf(buf, sizeof(buf), fmt, ap);
 	va_end(ap);