#if __STDC__ --> #ifdef __STDC__

4 files changed, 43 insertions, 43 deletions

diff --git a/usr.sbin/ypserv/common/yplog.c b/usr.sbin/ypserv/common/yplog.c
index 3072492099f..4afd2677bc2 100644
--- a/usr.sbin/ypserv/common/yplog.c
+++ b/usr.sbin/ypserv/common/yplog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yplog.c,v 1.3 1996/05/30 09:53:03 deraadt Exp $ */
+/*	$OpenBSD: yplog.c,v 1.4 1997/07/25 20:12:30 mickey Exp $ */
 
 /*
  * Copyright (c) 1996 Charles D. Cranor
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#if __STDC__
+#ifdef __STDC__
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -55,7 +55,7 @@ static FILE	*logfp = NULL;		/* the log file */
  */
 
 void
-#if __STDC__
+#ifdef __STDC__
 yplog(const char *fmt, ...)
 #else
 yplog(fmt, va_alist)
@@ -65,7 +65,7 @@ yplog(fmt, va_alist)
 {
 	va_list ap;
 
-#if __STDC__
+#ifdef __STDC__
 	va_start(ap, fmt);
 #else
 	va_start(ap);
diff --git a/usr.sbin/ypserv/yppush/yppush.h b/usr.sbin/ypserv/yppush/yppush.h
index 3f146f57b4f..67284763adf 100644
--- a/usr.sbin/ypserv/yppush/yppush.h
+++ b/usr.sbin/ypserv/yppush/yppush.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush.h,v 1.2 1996/05/30 09:53:20 deraadt Exp $ */
+/*	$OpenBSD: yppush.h,v 1.3 1997/07/25 20:12:32 mickey Exp $ */
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -58,7 +58,7 @@ enum yppush_status {
 typedef enum yppush_status yppush_status;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_yppush_status(XDR *, yppush_status*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_yppush_status(XDR *, yppush_status*);
 #else /* Old Style C */ 
 bool_t xdr_yppush_status();
@@ -72,7 +72,7 @@ struct yppushresp_xfr {
 typedef struct yppushresp_xfr yppushresp_xfr;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
 #else /* Old Style C */ 
 bool_t xdr_yppushresp_xfr();
@@ -90,7 +90,7 @@ extern "C" void * yppushproc_null_1_svc(void *, struct svc_req *);
 extern "C" void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *);
 extern "C" void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *);
 
-#elif __STDC__
+#elif defined(__STDC__)
 #define YPPUSHPROC_NULL ((u_long)0)
 extern  void * yppushproc_null_1(void *, CLIENT *);
 extern  void * yppushproc_null_1_svc(void *, struct svc_req *);
diff --git a/usr.sbin/ypserv/ypserv/yp.h b/usr.sbin/ypserv/ypserv/yp.h
index 09b9851bae9..01c6976da31 100644
--- a/usr.sbin/ypserv/ypserv/yp.h
+++ b/usr.sbin/ypserv/ypserv/yp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: yp.h,v 1.4 1997/05/01 22:14:47 niklas Exp $ */
+/* $OpenBSD: yp.h,v 1.5 1997/07/25 20:12:31 mickey Exp $ */
 
 /*
  * Please do not edit this file.
@@ -31,7 +31,7 @@ enum ypstat {
 typedef enum ypstat ypstat;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypstat(XDR *, ypstat*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypstat(XDR *, ypstat*);
 #else /* Old Style C */ 
 bool_t xdr_ypstat();
@@ -59,7 +59,7 @@ enum ypxfrstat {
 typedef enum ypxfrstat ypxfrstat;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypxfrstat(XDR *, ypxfrstat*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypxfrstat(XDR *, ypxfrstat*);
 #else /* Old Style C */ 
 bool_t xdr_ypxfrstat();
@@ -69,7 +69,7 @@ bool_t xdr_ypxfrstat();
 typedef char *domainname;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_domainname(XDR *, domainname*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_domainname(XDR *, domainname*);
 #else /* Old Style C */ 
 bool_t xdr_domainname();
@@ -79,7 +79,7 @@ bool_t xdr_domainname();
 typedef char *mapname;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_mapname(XDR *, mapname*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_mapname(XDR *, mapname*);
 #else /* Old Style C */ 
 bool_t xdr_mapname();
@@ -89,7 +89,7 @@ bool_t xdr_mapname();
 typedef char *peername;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_peername(XDR *, peername*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_peername(XDR *, peername*);
 #else /* Old Style C */ 
 bool_t xdr_peername();
@@ -102,7 +102,7 @@ typedef struct {
 } keydat;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_keydat(XDR *, keydat*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_keydat(XDR *, keydat*);
 #else /* Old Style C */ 
 bool_t xdr_keydat();
@@ -115,7 +115,7 @@ typedef struct {
 } valdat;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_valdat(XDR *, valdat*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_valdat(XDR *, valdat*);
 #else /* Old Style C */ 
 bool_t xdr_valdat();
@@ -131,7 +131,7 @@ struct ypmap_parms {
 typedef struct ypmap_parms ypmap_parms;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypmap_parms(XDR *, ypmap_parms*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypmap_parms(XDR *, ypmap_parms*);
 #else /* Old Style C */ 
 bool_t xdr_ypmap_parms();
@@ -146,7 +146,7 @@ struct ypreq_key {
 typedef struct ypreq_key ypreq_key;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypreq_key(XDR *, ypreq_key*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypreq_key(XDR *, ypreq_key*);
 #else /* Old Style C */ 
 bool_t xdr_ypreq_key();
@@ -160,7 +160,7 @@ struct ypreq_nokey {
 typedef struct ypreq_nokey ypreq_nokey;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypreq_nokey(XDR *, ypreq_nokey*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypreq_nokey(XDR *, ypreq_nokey*);
 #else /* Old Style C */ 
 bool_t xdr_ypreq_nokey();
@@ -176,7 +176,7 @@ struct ypreq_xfr {
 typedef struct ypreq_xfr ypreq_xfr;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypreq_xfr(XDR *, ypreq_xfr*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypreq_xfr(XDR *, ypreq_xfr*);
 #else /* Old Style C */ 
 bool_t xdr_ypreq_xfr();
@@ -190,7 +190,7 @@ struct ypresp_val {
 typedef struct ypresp_val ypresp_val;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypresp_val(XDR *, ypresp_val*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypresp_val(XDR *, ypresp_val*);
 #else /* Old Style C */ 
 bool_t xdr_ypresp_val();
@@ -205,7 +205,7 @@ struct ypresp_key_val {
 typedef struct ypresp_key_val ypresp_key_val;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypresp_key_val(XDR *, ypresp_key_val*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypresp_key_val(XDR *, ypresp_key_val*);
 #else /* Old Style C */ 
 bool_t xdr_ypresp_key_val();
@@ -219,7 +219,7 @@ struct ypresp_master {
 typedef struct ypresp_master ypresp_master;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypresp_master(XDR *, ypresp_master*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypresp_master(XDR *, ypresp_master*);
 #else /* Old Style C */ 
 bool_t xdr_ypresp_master();
@@ -233,7 +233,7 @@ struct ypresp_order {
 typedef struct ypresp_order ypresp_order;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypresp_order(XDR *, ypresp_order*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypresp_order(XDR *, ypresp_order*);
 #else /* Old Style C */ 
 bool_t xdr_ypresp_order();
@@ -249,7 +249,7 @@ struct ypresp_all {
 typedef struct ypresp_all ypresp_all;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypresp_all(XDR *, ypresp_all*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypresp_all(XDR *, ypresp_all*);
 #else /* Old Style C */ 
 bool_t xdr_ypresp_all();
@@ -263,7 +263,7 @@ struct ypresp_xfr {
 typedef struct ypresp_xfr ypresp_xfr;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypresp_xfr(XDR *, ypresp_xfr*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypresp_xfr(XDR *, ypresp_xfr*);
 #else /* Old Style C */ 
 bool_t xdr_ypresp_xfr();
@@ -277,7 +277,7 @@ struct ypmaplist {
 typedef struct ypmaplist ypmaplist;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypmaplist(XDR *, ypmaplist*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypmaplist(XDR *, ypmaplist*);
 #else /* Old Style C */ 
 bool_t xdr_ypmaplist();
@@ -291,7 +291,7 @@ struct ypresp_maplist {
 typedef struct ypresp_maplist ypresp_maplist;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypresp_maplist(XDR *, ypresp_maplist*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypresp_maplist(XDR *, ypresp_maplist*);
 #else /* Old Style C */ 
 bool_t xdr_ypresp_maplist();
@@ -319,7 +319,7 @@ enum yppush_status {
 typedef enum yppush_status yppush_status;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_yppush_status(XDR *, yppush_status*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_yppush_status(XDR *, yppush_status*);
 #else /* Old Style C */ 
 bool_t xdr_yppush_status();
@@ -333,7 +333,7 @@ struct yppushresp_xfr {
 typedef struct yppushresp_xfr yppushresp_xfr;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
 #else /* Old Style C */ 
 bool_t xdr_yppushresp_xfr();
@@ -347,7 +347,7 @@ enum ypbind_resptype {
 typedef enum ypbind_resptype ypbind_resptype;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypbind_resptype(XDR *, ypbind_resptype*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypbind_resptype(XDR *, ypbind_resptype*);
 #else /* Old Style C */ 
 bool_t xdr_ypbind_resptype();
@@ -361,7 +361,7 @@ struct ypbind_binding {
 typedef struct ypbind_binding ypbind_binding;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypbind_binding(XDR *, ypbind_binding*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypbind_binding(XDR *, ypbind_binding*);
 #else /* Old Style C */ 
 bool_t xdr_ypbind_binding();
@@ -378,7 +378,7 @@ struct ypbind_resp {
 typedef struct ypbind_resp ypbind_resp;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypbind_resp(XDR *, ypbind_resp*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypbind_resp(XDR *, ypbind_resp*);
 #else /* Old Style C */ 
 bool_t xdr_ypbind_resp();
@@ -396,7 +396,7 @@ struct ypbind_setdom {
 typedef struct ypbind_setdom ypbind_setdom;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypbind_setdom(XDR *, ypbind_setdom*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypbind_setdom(XDR *, ypbind_setdom*);
 #else /* Old Style C */ 
 bool_t xdr_ypbind_setdom();
@@ -444,7 +444,7 @@ extern "C" ypresp_order * ypproc_order_2_svc(ypreq_nokey *, struct svc_req *);
 extern "C" ypresp_maplist * ypproc_maplist_2(domainname *, CLIENT *);
 extern "C" ypresp_maplist * ypproc_maplist_2_svc(domainname *, struct svc_req *);
 
-#elif __STDC__
+#elif defined(__STDC__)
 #define YPPROC_NULL ((u_long)0)
 extern  void * ypproc_null_2(void *, CLIENT *);
 extern  void * ypproc_null_2_svc(void *, struct svc_req *);
@@ -532,7 +532,7 @@ extern "C" void * yppushproc_null_1_svc(void *, struct svc_req *);
 extern "C" yppushresp_xfr * yppushproc_xfrresp_1(void *, CLIENT *);
 extern "C" yppushresp_xfr * yppushproc_xfrresp_1_svc(void *, struct svc_req *);
 
-#elif __STDC__
+#elif defined(__STDC__)
 #define YPPUSHPROC_NULL ((u_long)0)
 extern  void * yppushproc_null_1(void *, CLIENT *);
 extern  void * yppushproc_null_1_svc(void *, struct svc_req *);
@@ -563,7 +563,7 @@ extern "C" ypbind_resp * ypbindproc_domain_2_svc(domainname *, struct svc_req *)
 extern "C" void * ypbindproc_setdom_2(ypbind_setdom *, CLIENT *);
 extern "C" void * ypbindproc_setdom_2_svc(ypbind_setdom *, struct svc_req *);
 
-#elif __STDC__
+#elif defined(__STDC__)
 #define YPBINDPROC_NULL ((u_long)0)
 extern  void * ypbindproc_null_2(void *, CLIENT *);
 extern  void * ypbindproc_null_2_svc(void *, struct svc_req *);
diff --git a/usr.sbin/ypserv/ypserv/ypv1.h b/usr.sbin/ypserv/ypserv/ypv1.h
index 36264a0bccf..1f2d08b9883 100644
--- a/usr.sbin/ypserv/ypserv/ypv1.h
+++ b/usr.sbin/ypserv/ypserv/ypv1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypv1.h,v 1.1 1997/03/30 20:51:24 maja Exp $ */
+/* $OpenBSD: ypv1.h,v 1.2 1997/07/25 20:12:31 mickey Exp $ */
 
 /*
  * Please do not edit this file.
@@ -20,7 +20,7 @@ enum ypreqtype {
 typedef enum ypreqtype ypreqtype;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypreqtype(XDR *, ypreqtype*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypreqtype(XDR *, ypreqtype*);
 #else /* Old Style C */ 
 bool_t xdr_ypreqtype();
@@ -36,7 +36,7 @@ typedef struct {
 } yprequest;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_yprequest(XDR *, yprequest*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_yprequest(XDR *, yprequest*);
 #else /* Old Style C */ 
 bool_t xdr_yprequest();
@@ -86,7 +86,7 @@ enum ypresptype {
 typedef enum ypresptype ypresptype;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypresptype(XDR *, ypresptype*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypresptype(XDR *, ypresptype*);
 #else /* Old Style C */ 
 bool_t xdr_ypresptype();
@@ -102,7 +102,7 @@ typedef struct {
 } ypresponse;
 #ifdef __cplusplus 
 extern "C" bool_t xdr_ypresponse(XDR *, ypresponse*);
-#elif __STDC__ 
+#elif defined(__STDC__)
 extern  bool_t xdr_ypresponse(XDR *, ypresponse*);
 #else /* Old Style C */ 
 bool_t xdr_ypresponse();
@@ -173,7 +173,7 @@ extern "C" void * ypproc_pull_1_svc(yprequest *, struct svc_req *);
 extern "C" void * ypproc_get_1(yprequest *, CLIENT *);
 extern "C" void * ypproc_get_1_svc(yprequest *, struct svc_req *);
 
-#elif __STDC__
+#elif defined(__STDC__)
 #define YPOLDPROC_NULL ((u_long)0)
 extern  void * ypproc_null_1(void *, CLIENT *);
 extern  void * ypproc_null_1_svc(void *, struct svc_req *);