We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.

2 files changed, 16 insertions, 52 deletions

diff --git a/usr.sbin/ypserv/yppush/yppush.h b/usr.sbin/ypserv/yppush/yppush.h
index 9414d8073a4..5114d0f403b 100644
--- a/usr.sbin/ypserv/yppush/yppush.h
+++ b/usr.sbin/ypserv/yppush/yppush.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush.h,v 1.4 2000/10/12 09:47:27 deraadt Exp $ */
+/*	$OpenBSD: yppush.h,v 1.5 2002/02/19 19:39:41 millert Exp $ */
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -36,7 +36,6 @@
 
 #include <rpc/rpc.h>
 
-
 enum yppush_status {
 	YPPUSH_SUCC = 1,
 	YPPUSH_AGE = 2,
@@ -56,57 +55,26 @@ enum yppush_status {
 	YPPUSH_REFUSED = -14,
 };
 typedef enum yppush_status yppush_status;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_yppush_status(XDR *, yppush_status*);
-#elif defined(__STDC__)
-extern  bool_t xdr_yppush_status(XDR *, yppush_status*);
-#else /* Old Style C */ 
-bool_t xdr_yppush_status();
-#endif /* Old Style C */ 
-
 
 struct yppushresp_xfr {
 	u_int transid;
 	yppush_status status;
 };
 typedef struct yppushresp_xfr yppushresp_xfr;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-#elif defined(__STDC__)
-extern  bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-#else /* Old Style C */ 
-bool_t xdr_yppushresp_xfr();
-#endif /* Old Style C */ 
-
-
-#define YPPUSH_XFRRESPPROG ((u_long)0x40000000)
-#define YPPUSH_XFRRESPVERS ((u_long)1)
-
-#ifdef __cplusplus
-#define YPPUSHPROC_NULL ((u_long)0)
-extern "C" void * yppushproc_null_1(void *, CLIENT *);
-extern "C" void * yppushproc_null_1_svc(void *, struct svc_req *);
-#define YPPUSHPROC_XFRRESP ((u_long)1)
-extern "C" void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *);
-extern "C" void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *);
-
-#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 *);
-#define YPPUSHPROC_XFRRESP ((u_long)1)
-extern  void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *);
-extern  void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *);
 
-#else /* Old Style C */ 
-#define YPPUSHPROC_NULL ((u_long)0)
-extern  void * yppushproc_null_1();
-extern  void * yppushproc_null_1_svc();
-#define YPPUSHPROC_XFRRESP ((u_long)1)
-extern  void * yppushproc_xfrresp_1();
-extern  void * yppushproc_xfrresp_1_svc();
-#endif /* Old Style C */ 
+#define YPPUSH_XFRRESPPROG	((u_long)0x40000000)
+#define YPPUSH_XFRRESPVERS	((u_long)1)
+#define YPPUSHPROC_NULL		((u_long)0)
+#define YPPUSHPROC_XFRRESP	((u_long)1)
 
-char *	yppush_err_string(enum yppush_status y);
+__BEGIN_DECLS
+bool_t xdr_yppush_status(XDR *, yppush_status*);
+bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
+void * yppushproc_null_1(void *, CLIENT *);
+void * yppushproc_null_1_svc(void *, struct svc_req *);
+void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *);
+void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *);
+char * yppush_err_string(enum yppush_status y);
+__END_DECLS
 
 #endif /* !_YPPUSH_H_RPCGEN */
diff --git a/usr.sbin/ypserv/yppush/yppush_svc.c b/usr.sbin/ypserv/yppush/yppush_svc.c
index d0b9a9deef2..58dee344ac1 100644
--- a/usr.sbin/ypserv/yppush/yppush_svc.c
+++ b/usr.sbin/ypserv/yppush/yppush_svc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush_svc.c,v 1.5 2001/11/19 04:21:41 deraadt Exp $ */
+/*	$OpenBSD: yppush_svc.c,v 1.6 2002/02/19 19:39:41 millert Exp $ */
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.5 2001/11/19 04:21:41 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.6 2002/02/19 19:39:41 millert Exp $";
 #endif /* not lint */
 
 #include "yppush.h"
@@ -47,10 +47,6 @@ static char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.5 2001/11/19 04:21:41 deraadt
 #include <memory.h>
 #include <syslog.h>
 
-#ifdef __STDC__
-#define SIG_PF void(*)(int)
-#endif
-
 #ifdef DEBUG
 #define RPC_SVC_FG
 #endif