From 3923126b85f9e8a77cab9a41b5a62125acd5b4cd Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Tue, 19 Feb 2002 19:39:42 +0000
Subject: We live in an ANSI C world.  Remove lots of gratuitous #ifdef
 __STDC__ cruft.

---
 lib/libc/gen/syslog.c | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

(limited to 'lib/libc/gen/syslog.c')

diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index dcfc0b9ac01..a10ecf37702 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: syslog.c,v 1.15 2002/02/18 00:07:56 millert Exp $";
+static char rcsid[] = "$OpenBSD: syslog.c,v 1.16 2002/02/19 19:39:36 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -49,12 +49,7 @@ static char rcsid[] = "$OpenBSD: syslog.c,v 1.15 2002/02/18 00:07:56 millert Exp
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 static struct syslog_data sdata = SYSLOG_DATA_INIT;
 
@@ -70,22 +65,11 @@ static void	connectlog_r(struct syslog_data *);
  *	print message on log file; output is intended for syslogd(8).
  */
 void
-#ifdef __STDC__
 syslog(int pri, const char *fmt, ...)
-#else
-syslog(pri, fmt, va_alist)
-	int pri;
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#ifdef __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	vsyslog(pri, fmt, ap);
 	va_end(ap);
 }
@@ -136,23 +120,11 @@ setlogmask(pmask)
 /* Reentrant version of syslog, i.e. syslog_r() */
 
 void
-#ifdef __STDC__
 syslog_r(int pri, struct syslog_data *data, const char *fmt, ...)
-#else
-syslog_r(pri, data, fmt, va_alist)
-	int pri;
-	struct syslog_data *data;
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#ifdef __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	vsyslog_r(pri, data, fmt, ap);
 	va_end(ap);
 }
-- 
cgit v1.2.3