summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1997-07-25 19:41:21 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1997-07-25 19:41:21 +0000
commit1c0190bf65ffb0a018ad7621c5494bd94d0f1f95 (patch)
treec905e15dd9dd46e02df594f821082846e0fb114d /libexec
parenta57a2f8a05e5ecb420666be177391e7b1592337d (diff)
#if __STDC__ --> #ifdef __STDC__
Diffstat (limited to 'libexec')
-rw-r--r--libexec/fingerd/fingerd.c8
-rw-r--r--libexec/ftpd/ftpd.c12
-rw-r--r--libexec/lfs_cleanerd/misc.c10
-rw-r--r--libexec/mail.local/mail.local.c8
-rw-r--r--libexec/rpc.yppasswdd/yppasswd.h12
-rw-r--r--libexec/rshd/rshd.c8
6 files changed, 29 insertions, 29 deletions
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index 64c2d0efbca..f91791671dc 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -39,7 +39,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)fingerd.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$Id: fingerd.c,v 1.7 1997/07/23 20:36:22 kstailey Exp $";
+static char rcsid[] = "$Id: fingerd.c,v 1.8 1997/07/25 19:41:14 mickey Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -193,14 +193,14 @@ main(argc, argv)
exit(0);
}
-#if __STDC__
+#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
void
-#if __STDC__
+#ifdef __STDC__
err(const char *fmt, ...)
#else
err(fmt, va_alist)
@@ -209,7 +209,7 @@ err(fmt, va_alist)
#endif
{
va_list ap;
-#if __STDC__
+#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 3d618d505ff..a59df1b165f 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftpd.c,v 1.41 1997/07/23 20:36:24 kstailey Exp $ */
+/* $OpenBSD: ftpd.c,v 1.42 1997/07/25 19:41:16 mickey Exp $ */
/* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */
/*
@@ -100,7 +100,7 @@ static char rcsid[] = "$NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $"
#include "pathnames.h"
#include "extern.h"
-#if __STDC__
+#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
@@ -1536,7 +1536,7 @@ fatal(s)
}
void
-#if __STDC__
+#ifdef __STDC__
reply(int n, const char *fmt, ...)
#else
reply(n, fmt, va_alist)
@@ -1546,7 +1546,7 @@ reply(n, fmt, va_alist)
#endif
{
va_list ap;
-#if __STDC__
+#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
@@ -1562,7 +1562,7 @@ reply(n, fmt, va_alist)
}
void
-#if __STDC__
+#ifdef __STDC__
lreply(int n, const char *fmt, ...)
#else
lreply(n, fmt, va_alist)
@@ -1572,7 +1572,7 @@ lreply(n, fmt, va_alist)
#endif
{
va_list ap;
-#if __STDC__
+#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
diff --git a/libexec/lfs_cleanerd/misc.c b/libexec/lfs_cleanerd/misc.c
index 884b6020edd..3c49ea4cef2 100644
--- a/libexec/lfs_cleanerd/misc.c
+++ b/libexec/lfs_cleanerd/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.2 1996/07/01 11:04:58 downsj Exp $ */
+/* $OpenBSD: misc.c,v 1.3 1997/07/25 19:41:17 mickey Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: misc.c,v 1.2 1996/07/01 11:04:58 downsj Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.3 1997/07/25 19:41:17 mickey Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -48,14 +48,14 @@ static char rcsid[] = "$OpenBSD: misc.c,v 1.2 1996/07/01 11:04:58 downsj Exp $";
extern char *special;
-#if __STDC__
+#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
void
-#if __STDC__
+#ifdef __STDC__
err(const int fatal, const char *fmt, ...)
#else
err(fmt, va_alist)
@@ -64,7 +64,7 @@ err(fmt, va_alist)
#endif
{
va_list ap;
-#if __STDC__
+#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c
index e216ba3ed83..b4af745df8f 100644
--- a/libexec/mail.local/mail.local.c
+++ b/libexec/mail.local/mail.local.c
@@ -39,7 +39,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mail.local.c 5.6 (Berkeley) 6/19/91";*/
-static char rcsid[] = "$Id: mail.local.c,v 1.15 1997/04/04 18:41:27 deraadt Exp $";
+static char rcsid[] = "$Id: mail.local.c,v 1.16 1997/07/25 19:41:18 mickey Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -495,14 +495,14 @@ usage()
err(FATAL, "usage: mail.local [-lLH] [-f from] user ...");
}
-#if __STDC__
+#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
void
-#if __STDC__
+#ifdef __STDC__
err(int isfatal, const char *fmt, ...)
#else
err(isfatal, fmt)
@@ -512,7 +512,7 @@ err(isfatal, fmt)
#endif
{
va_list ap;
-#if __STDC__
+#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
diff --git a/libexec/rpc.yppasswdd/yppasswd.h b/libexec/rpc.yppasswdd/yppasswd.h
index 02d6ad405ee..1cd3b7b56f4 100644
--- a/libexec/rpc.yppasswdd/yppasswd.h
+++ b/libexec/rpc.yppasswdd/yppasswd.h
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: yppasswd.h,v 1.2 1996/06/26 22:11:26 maja Exp $
+ * $Id: yppasswd.h,v 1.3 1997/07/25 19:41:19 mickey Exp $
*/
#ifndef _YPPASSWD_H_RPCGEN
@@ -46,11 +46,11 @@ struct x_passwd {
typedef struct x_passwd x_passwd;
#ifdef __cplusplus
extern "C" bool_t xdr_x_passwd(XDR *, x_passwd*);
-#elif __STDC__
+#elif defined(__STDC__)
extern bool_t xdr_x_passwd(XDR *, x_passwd*);
-#else /* Old Style C */
+#else /* Old Style C */
bool_t xdr_x_passwd();
-#endif /* Old Style C */
+#endif /* Old Style C */
struct yppasswd {
@@ -60,7 +60,7 @@ struct yppasswd {
typedef struct yppasswd yppasswd;
#ifdef __cplusplus
extern "C" bool_t xdr_yppasswd(XDR *, yppasswd*);
-#elif __STDC__
+#elif defined(__STDC__)
extern bool_t xdr_yppasswd(XDR *, yppasswd*);
#else /* Old Style C */
bool_t xdr_yppasswd();
@@ -75,7 +75,7 @@ bool_t xdr_yppasswd();
extern "C" int * yppasswdproc_update_1(yppasswd *, CLIENT *);
extern "C" int * yppasswdproc_update_1_svc(yppasswd *, struct svc_req *, SVCXPRT *);
-#elif __STDC__
+#elif defined(__STDC__)
#define YPPASSWDPROC_UPDATE ((u_long)1)
extern int * yppasswdproc_update_1(yppasswd *, CLIENT *);
extern int * yppasswdproc_update_1_svc(yppasswd *, struct svc_req *, SVCXPRT *);
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index b9dc74f6375..5ce05da8a6f 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -39,7 +39,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; */
-static char *rcsid = "$Id: rshd.c,v 1.19 1997/07/23 20:36:34 kstailey Exp $";
+static char *rcsid = "$Id: rshd.c,v 1.20 1997/07/25 19:41:20 mickey Exp $";
#endif /* not lint */
/*
@@ -699,14 +699,14 @@ fail:
* connected to client, or older clients will hang waiting for that
* connection first.
*/
-#if __STDC__
+#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
void
-#if __STDC__
+#ifdef __STDC__
error(const char *fmt, ...)
#else
error(fmt, va_alist)
@@ -717,7 +717,7 @@ error(fmt, va_alist)
va_list ap;
int len;
char *bp, buf[BUFSIZ];
-#if __STDC__
+#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);