diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-07-25 20:12:33 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-07-25 20:12:33 +0000 |
| commit | 1626c644fa840e7d0e3178a0c02abb959cbb2d39 (patch) | |
| tree | 6ccdff5f99d9f696c32990e7e7300e577ecb2010 | |
| parent | bdd29b5fbbe2dc1fb578b767909cfc64b6db403b (diff) | |
#if __STDC__ --> #ifdef __STDC__
38 files changed, 145 insertions, 145 deletions
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h index 79c6bd62053..252e054f438 100644 --- a/usr.sbin/config/config.h +++ b/usr.sbin/config/config.h @@ -1,4 +1,4 @@ -/* $OpenBSD: config.h,v 1.8 1997/07/06 03:54:04 downsj Exp $ */ +/* $OpenBSD: config.h,v 1.9 1997/07/25 20:12:10 mickey Exp $ */ /* $NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $ */ /* @@ -63,7 +63,7 @@ #endif /* ...STDC */ #endif /* ...BSD */ -#if __STDC__ +#ifdef __STDC__ #include <stdlib.h> #include <unistd.h> #endif diff --git a/usr.sbin/config/util.c b/usr.sbin/config/util.c index 576512bed4e..b470ac4c8dd 100644 --- a/usr.sbin/config/util.c +++ b/usr.sbin/config/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.5 1996/10/23 22:38:02 niklas Exp $ */ +/* $OpenBSD: util.c,v 1.6 1997/07/25 20:12:10 mickey Exp $ */ /* $NetBSD: util.c,v 1.5 1996/08/31 20:58:29 mycroft Exp $ */ /* @@ -49,7 +49,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -172,7 +172,7 @@ nvfreel(nv) * and line number. */ void -#if __STDC__ +#ifdef __STDC__ error(const char *fmt, ...) #else error(fmt, va_alist) @@ -183,7 +183,7 @@ error(fmt, va_alist) va_list ap; extern const char *yyfile; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); @@ -197,7 +197,7 @@ error(fmt, va_alist) * find out about it until later). */ void -#if __STDC__ +#ifdef __STDC__ xerror(const char *file, int line, const char *fmt, ...) #else xerror(file, line, fmt, va_alist) @@ -209,7 +209,7 @@ xerror(file, line, fmt, va_alist) { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); @@ -239,7 +239,7 @@ vxerror(file, line, fmt, ap) * Internal error, abort. */ __dead void -#if __STDC__ +#ifdef __STDC__ panic(const char *fmt, ...) #else panic(fmt, va_alist) @@ -249,7 +249,7 @@ panic(fmt, va_alist) { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index 4fc3194d8cc..13df6931499 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.6 1997/07/24 01:10:33 millert Exp $ */ +/* $OpenBSD: common.c,v 1.7 1997/07/25 20:12:11 mickey Exp $ */ /* * Copyright (c) 1983, 1993 @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: common.c,v 1.6 1997/07/24 01:10:33 millert Exp $"; +static char rcsid[] = "$OpenBSD: common.c,v 1.7 1997/07/25 20:12:11 mickey Exp $"; #endif #endif /* not lint */ @@ -359,14 +359,14 @@ delay(n) (void) select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &tdelay); } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif void -#if __STDC__ +#ifdef __STDC__ fatal(const char *msg, ...) #else fatal(msg, va_alist) @@ -375,7 +375,7 @@ fatal(msg, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, msg); #else va_start(ap); diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index a9b3441f642..f66ac4f0895 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printjob.c,v 1.15 1997/07/23 10:12:43 deraadt Exp $ */ +/* $OpenBSD: printjob.c,v 1.16 1997/07/25 20:12:12 mickey Exp $ */ /* $NetBSD: printjob.c,v 1.9.4.3 1996/07/12 22:31:39 jtc Exp $ */ /* @@ -1537,14 +1537,14 @@ setty() return; } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif static void -#if __STDC__ +#ifdef __STDC__ pstatus(const char *msg, ...) #else pstatus(msg, va_alist) @@ -1555,7 +1555,7 @@ pstatus(msg, va_alist) register int fd; char buf[BUFSIZ]; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, msg); #else va_start(ap); diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c index 426f8a97ed8..d6b1cebd6dc 100644 --- a/usr.sbin/lpr/lpd/recvjob.c +++ b/usr.sbin/lpr/lpd/recvjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: recvjob.c,v 1.10 1997/07/20 19:04:18 deraadt Exp $ */ +/* $OpenBSD: recvjob.c,v 1.11 1997/07/25 20:12:13 mickey Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95"; #else -static char rcsid[] = "$OpenBSD: recvjob.c,v 1.10 1997/07/20 19:04:18 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: recvjob.c,v 1.11 1997/07/25 20:12:13 mickey Exp $"; #endif #endif /* not lint */ @@ -342,14 +342,14 @@ rcleanup(signo) dfname[0] = '\0'; } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif static void -#if __STDC__ +#ifdef __STDC__ frecverr(const char *msg, ...) #else frecverr(msg, va_alist) @@ -359,7 +359,7 @@ frecverr(msg, va_alist) { extern char fromb[]; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, msg); #else va_start(ap); diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c index 4889be99396..7ace3904c97 100644 --- a/usr.sbin/lpr/lpr/lpr.c +++ b/usr.sbin/lpr/lpr/lpr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpr.c,v 1.18 1997/07/19 07:11:44 deraadt Exp $ */ +/* $OpenBSD: lpr.c,v 1.19 1997/07/25 20:12:13 mickey Exp $ */ /* $NetBSD: lpr.c,v 1.10 1996/03/21 18:12:25 jtc Exp $ */ /* @@ -50,7 +50,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: lpr.c,v 1.18 1997/07/19 07:11:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: lpr.c,v 1.19 1997/07/25 20:12:13 mickey Exp $"; #endif #endif /* not lint */ @@ -745,14 +745,14 @@ lmktemp(id, num, len) return(s); } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif static void -#if __STDC__ +#ifdef __STDC__ fatal2(const char *msg, ...) #else fatal2(msg, va_alist) @@ -761,7 +761,7 @@ fatal2(msg, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, msg); #else va_start(ap); diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c index b2997e6cf46..bbef707f32b 100644 --- a/usr.sbin/mtree/create.c +++ b/usr.sbin/mtree/create.c @@ -1,5 +1,5 @@ /* $NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $ */ -/* $OpenBSD: create.c,v 1.9 1997/07/18 05:49:02 millert Exp $ */ +/* $OpenBSD: create.c,v 1.10 1997/07/25 20:12:15 mickey Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: create.c,v 1.9 1997/07/18 05:49:02 millert Exp $"; +static char rcsid[] = "$OpenBSD: create.c,v 1.10 1997/07/25 20:12:15 mickey Exp $"; #endif #endif /* not lint */ @@ -340,14 +340,14 @@ dsort(a, b) return (strcmp((*a)->fts_name, (*b)->fts_name)); } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif void -#if __STDC__ +#ifdef __STDC__ output(int indent, int *offset, const char *fmt, ...) #else output(indent, offset, fmt, va_alist) @@ -359,7 +359,7 @@ output(indent, offset, fmt, va_alist) { va_list ap; char buf[1024]; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c index 7ce6ba40cbe..a5c09e21c65 100644 --- a/usr.sbin/mtree/misc.c +++ b/usr.sbin/mtree/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.7 1997/07/18 05:49:03 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.8 1997/07/25 20:12:14 mickey Exp $ */ /* $NetBSD: misc.c,v 1.4 1995/03/07 21:26:23 cgd Exp $ */ /*- @@ -99,14 +99,14 @@ keycompare(a, b) return (strcmp(((KEY *)a)->name, ((KEY *)b)->name)); } -#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) @@ -115,7 +115,7 @@ error(fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c index 13c793d96ad..72373bec314 100644 --- a/usr.sbin/pppd/main.c +++ b/usr.sbin/pppd/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.15 1997/03/29 04:17:22 dgregor Exp $ */ +/* $OpenBSD: main.c,v 1.16 1997/07/25 20:12:16 mickey Exp $ */ /* * main.c - Point-to-Point Protocol main module @@ -20,7 +20,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: main.c,v 1.15 1997/03/29 04:17:22 dgregor Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.16 1997/07/25 20:12:16 mickey Exp $"; #endif #include <stdio.h> @@ -1228,7 +1228,7 @@ pr_log __V((void *arg, char *fmt, ...)) va_list pvar; char buf[256]; -#if __STDC__ +#ifdef __STDC__ va_start(pvar, fmt); #else void *arg; @@ -1314,7 +1314,7 @@ fmtmsg __V((char *buf, int buflen, char *fmt, ...)) va_list args; int n; -#if __STDC__ +#ifdef __STDC__ va_start(args, fmt); #else char *buf; diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c index 44e509fa056..4ea831cde71 100644 --- a/usr.sbin/pppd/options.c +++ b/usr.sbin/pppd/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.7 1997/01/02 10:50:20 mickey Exp $ */ +/* $OpenBSD: options.c,v 1.8 1997/07/25 20:12:15 mickey Exp $ */ /* * options.c - handles option processing for PPP. @@ -20,7 +20,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: options.c,v 1.7 1997/01/02 10:50:20 mickey Exp $"; +static char rcsid[] = "$OpenBSD: options.c,v 1.8 1997/07/25 20:12:15 mickey Exp $"; #endif #include <ctype.h> @@ -643,7 +643,7 @@ option_error __V((char *fmt, ...)) int n; char buf[256]; -#if __STDC__ +#ifdef __STDC__ va_start(args, fmt); #else char *fmt; diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h index 2aba5212ded..fd7eaa1975b 100644 --- a/usr.sbin/pppd/pppd.h +++ b/usr.sbin/pppd/pppd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pppd.h,v 1.4 1996/12/23 13:22:48 mickey Exp $ */ +/* $OpenBSD: pppd.h,v 1.5 1997/07/25 20:12:17 mickey Exp $ */ /* * pppd.h - PPP daemon global declarations. @@ -32,7 +32,7 @@ #include <sys/time.h> /* for struct timeval */ #include <net/ppp_defs.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #define __V(x) x #else diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 5d486576ce0..0f4d63a4291 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rarpd.c,v 1.10 1997/06/22 22:56:34 deraadt Exp $ */ +/* $OpenBSD: rarpd.c,v 1.11 1997/07/25 20:12:18 mickey Exp $ */ /* $NetBSD: rarpd.c,v 1.12 1996/03/21 18:28:23 jtc Exp $ */ /* @@ -28,7 +28,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: rarpd.c,v 1.10 1997/06/22 22:56:34 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rarpd.c,v 1.11 1997/07/25 20:12:18 mickey Exp $"; #endif @@ -803,14 +803,14 @@ ipaddrtonetmask(addr) /* NOTREACHED */ } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif void -#if __STDC__ +#ifdef __STDC__ err(int fatal, const char *fmt,...) #else err(fmt, va_alist) @@ -820,7 +820,7 @@ va_dcl #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); @@ -841,7 +841,7 @@ va_dcl } void -#if __STDC__ +#ifdef __STDC__ debug(const char *fmt,...) #else debug(fmt, va_alist) @@ -852,7 +852,7 @@ va_dcl va_list ap; if (dflag) { -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.sbin/rdate/rdate.c b/usr.sbin/rdate/rdate.c index 106544e5a18..ced3acd289b 100644 --- a/usr.sbin/rdate/rdate.c +++ b/usr.sbin/rdate/rdate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rdate.c,v 1.10 1997/04/27 13:11:38 downsj Exp $ */ +/* $OpenBSD: rdate.c,v 1.11 1997/07/25 20:12:18 mickey Exp $ */ /* $NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $ */ /* @@ -42,7 +42,7 @@ #if 0 from: static char rcsid[] = "$NetBSD: rdate.c,v 1.3 1996/02/22 06:59:18 thorpej Exp $"; #else -static char rcsid[] = "$OpenBSD: rdate.c,v 1.10 1997/04/27 13:11:38 downsj Exp $"; +static char rcsid[] = "$OpenBSD: rdate.c,v 1.11 1997/07/25 20:12:18 mickey Exp $"; #endif #endif /* lint */ @@ -61,7 +61,7 @@ static char rcsid[] = "$OpenBSD: rdate.c,v 1.10 1997/04/27 13:11:38 downsj Exp $ #include <time.h> /* seconds from midnight Jan 1900 - 1970 */ -#if __STDC__ +#ifdef __STDC__ #define DIFFERENCE 2208988800UL #else #define DIFFERENCE 2208988800 diff --git a/usr.sbin/tcpdump/addrtoname.c b/usr.sbin/tcpdump/addrtoname.c index 4b3ec282c86..b418aa3e902 100644 --- a/usr.sbin/tcpdump/addrtoname.c +++ b/usr.sbin/tcpdump/addrtoname.c @@ -23,14 +23,14 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/addrtoname.c,v 1.5 1996/12/12 16:23:00 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/addrtoname.c,v 1.6 1997/07/25 20:12:20 mickey Exp $ (LBL)"; #endif #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/gnuc.h b/usr.sbin/tcpdump/gnuc.h index 495bdf3bceb..e3e95cd33b9 100644 --- a/usr.sbin/tcpdump/gnuc.h +++ b/usr.sbin/tcpdump/gnuc.h @@ -1,8 +1,8 @@ -/* @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/gnuc.h,v 1.1 1996/12/12 16:22:54 bitblt Exp $ (LBL) */ +/* @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/gnuc.h,v 1.2 1997/07/25 20:12:29 mickey Exp $ (LBL) */ /* Define __P() macro, if necessary */ #ifndef __P -#if __STDC__ +#ifdef __STDC__ #define __P(protos) protos #else #define __P(protos) () diff --git a/usr.sbin/tcpdump/interface.h b/usr.sbin/tcpdump/interface.h index d323fae38a3..3143da01122 100644 --- a/usr.sbin/tcpdump/interface.h +++ b/usr.sbin/tcpdump/interface.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/interface.h,v 1.6 1997/07/23 02:59:01 denny Exp $ (LBL) + * @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/interface.h,v 1.7 1997/07/25 20:12:20 mickey Exp $ (LBL) */ #ifndef tcpdump_interface_h @@ -140,7 +140,7 @@ extern char *savestr(const char *); extern void wrapup(int); -#if __STDC__ +#ifdef __STDC__ extern __dead void error(const char *, ...) __attribute__((volatile, format (printf, 1, 2))); extern void warning(const char *, ...) __attribute__ ((format (printf, 1, 2))); diff --git a/usr.sbin/tcpdump/lbl/gnuc.h b/usr.sbin/tcpdump/lbl/gnuc.h index 5f4208c5665..b8edbf1ef9a 100644 --- a/usr.sbin/tcpdump/lbl/gnuc.h +++ b/usr.sbin/tcpdump/lbl/gnuc.h @@ -1,8 +1,8 @@ -/* @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/lbl/Attic/gnuc.h,v 1.1 1996/12/12 16:08:22 bitblt Exp $ (LBL) */ +/* @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/lbl/Attic/gnuc.h,v 1.2 1997/07/25 20:12:19 mickey Exp $ (LBL) */ /* Define __P() macro, if necessary */ #ifndef __P -#if __STDC__ +#ifdef __STDC__ #define __P(protos) protos #else #define __P(protos) () diff --git a/usr.sbin/tcpdump/print-arp.c b/usr.sbin/tcpdump/print-arp.c index 677e59de0c3..56abb3b4984 100644 --- a/usr.sbin/tcpdump/print-arp.c +++ b/usr.sbin/tcpdump/print-arp.c @@ -21,14 +21,14 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-arp.c,v 1.5 1996/12/12 16:22:43 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-arp.c,v 1.6 1997/07/25 20:12:21 mickey Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-atalk.c b/usr.sbin/tcpdump/print-atalk.c index 5ea6a2358c3..c67f14388d9 100644 --- a/usr.sbin/tcpdump/print-atalk.c +++ b/usr.sbin/tcpdump/print-atalk.c @@ -23,14 +23,14 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-atalk.c,v 1.6 1997/07/23 02:59:01 denny Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-atalk.c,v 1.7 1997/07/25 20:12:21 mickey Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-atm.c b/usr.sbin/tcpdump/print-atm.c index 4d4f94f9365..d6b119d942e 100644 --- a/usr.sbin/tcpdump/print-atm.c +++ b/usr.sbin/tcpdump/print-atm.c @@ -20,14 +20,14 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-atm.c,v 1.2 1996/12/12 16:22:42 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-atm.c,v 1.3 1997/07/25 20:12:28 mickey Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-bootp.c b/usr.sbin/tcpdump/print-bootp.c index f983089d7be..2a85de790d9 100644 --- a/usr.sbin/tcpdump/print-bootp.c +++ b/usr.sbin/tcpdump/print-bootp.c @@ -22,14 +22,14 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-bootp.c,v 1.5 1996/12/12 16:22:41 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-bootp.c,v 1.6 1997/07/25 20:12:22 mickey Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-decnet.c b/usr.sbin/tcpdump/print-decnet.c index f9408fe02f9..5793b0441af 100644 --- a/usr.sbin/tcpdump/print-decnet.c +++ b/usr.sbin/tcpdump/print-decnet.c @@ -21,14 +21,14 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-decnet.c,v 1.5 1996/12/12 16:22:41 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-decnet.c,v 1.6 1997/07/25 20:12:23 mickey Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-domain.c b/usr.sbin/tcpdump/print-domain.c index d2d34d092f0..2eab9bdfedb 100644 --- a/usr.sbin/tcpdump/print-domain.c +++ b/usr.sbin/tcpdump/print-domain.c @@ -21,14 +21,14 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-domain.c,v 1.5 1996/12/12 16:22:40 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-domain.c,v 1.6 1997/07/25 20:12:23 mickey Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-fddi.c b/usr.sbin/tcpdump/print-fddi.c index 2b7d1c59925..5c0d7465e24 100644 --- a/usr.sbin/tcpdump/print-fddi.c +++ b/usr.sbin/tcpdump/print-fddi.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-fddi.c,v 1.5 1996/12/12 16:22:38 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-fddi.c,v 1.6 1997/07/25 20:12:24 mickey Exp $ (LBL)"; #endif #ifdef HAVE_FDDI @@ -31,7 +31,7 @@ static const char rcsid[] = #include <sys/file.h> #include <sys/ioctl.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-icmp.c b/usr.sbin/tcpdump/print-icmp.c index 1730b2a0292..f03c893b0a1 100644 --- a/usr.sbin/tcpdump/print-icmp.c +++ b/usr.sbin/tcpdump/print-icmp.c @@ -21,14 +21,14 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-icmp.c,v 1.5 1996/12/12 16:22:37 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-icmp.c,v 1.6 1997/07/25 20:12:24 mickey Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-isoclns.c b/usr.sbin/tcpdump/print-isoclns.c index e6e7ea91105..9538045f9c6 100644 --- a/usr.sbin/tcpdump/print-isoclns.c +++ b/usr.sbin/tcpdump/print-isoclns.c @@ -23,14 +23,14 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-isoclns.c,v 1.5 1996/12/12 16:22:34 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-isoclns.c,v 1.6 1997/07/25 20:12:25 mickey Exp $ (LBL)"; #endif #include <sys/types.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-nfs.c b/usr.sbin/tcpdump/print-nfs.c index cd790faf79f..8111b1d3f3d 100644 --- a/usr.sbin/tcpdump/print-nfs.c +++ b/usr.sbin/tcpdump/print-nfs.c @@ -28,7 +28,7 @@ static const char rcsid[] = #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-ntp.c b/usr.sbin/tcpdump/print-ntp.c index 9787cb12900..2633f8aa526 100644 --- a/usr.sbin/tcpdump/print-ntp.c +++ b/usr.sbin/tcpdump/print-ntp.c @@ -25,14 +25,14 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ntp.c,v 1.5 1996/12/12 16:22:31 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ntp.c,v 1.6 1997/07/25 20:12:26 mickey Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-null.c b/usr.sbin/tcpdump/print-null.c index f8abf41172c..3be3383b1d3 100644 --- a/usr.sbin/tcpdump/print-null.c +++ b/usr.sbin/tcpdump/print-null.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-null.c,v 1.6 1997/07/23 02:59:02 denny Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-null.c,v 1.7 1997/07/25 20:12:26 mickey Exp $ (LBL)"; #endif #include <sys/param.h> @@ -30,7 +30,7 @@ static const char rcsid[] = #include <sys/file.h> #include <sys/ioctl.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-ppp.c b/usr.sbin/tcpdump/print-ppp.c index c5a8eceef1f..895d93e23dd 100644 --- a/usr.sbin/tcpdump/print-ppp.c +++ b/usr.sbin/tcpdump/print-ppp.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ppp.c,v 1.5 1996/12/12 16:22:28 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ppp.c,v 1.6 1997/07/25 20:12:27 mickey Exp $ (LBL)"; #endif #ifdef PPP @@ -31,7 +31,7 @@ static const char rcsid[] = #include <sys/file.h> #include <sys/ioctl.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/print-sl.c b/usr.sbin/tcpdump/print-sl.c index 405afff3eab..0e23388aa70 100644 --- a/usr.sbin/tcpdump/print-sl.c +++ b/usr.sbin/tcpdump/print-sl.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-sl.c,v 1.6 1996/12/12 16:22:27 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-sl.c,v 1.7 1997/07/25 20:12:27 mickey Exp $ (LBL)"; #endif #ifdef HAVE_NET_SLIP_H @@ -33,7 +33,7 @@ static const char rcsid[] = #include <sys/mbuf.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct rtentry; #endif #include <net/if.h> diff --git a/usr.sbin/tcpdump/print-sunrpc.c b/usr.sbin/tcpdump/print-sunrpc.c index 07ac4aa337c..380a9345a4d 100644 --- a/usr.sbin/tcpdump/print-sunrpc.c +++ b/usr.sbin/tcpdump/print-sunrpc.c @@ -21,14 +21,14 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-sunrpc.c,v 1.5 1996/12/12 16:22:26 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-sunrpc.c,v 1.6 1997/07/25 20:12:27 mickey Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ +#ifdef __STDC__ struct mbuf; struct rtentry; #endif diff --git a/usr.sbin/tcpdump/util.c b/usr.sbin/tcpdump/util.c index 05d7faed2f1..d2883300108 100644 --- a/usr.sbin/tcpdump/util.c +++ b/usr.sbin/tcpdump/util.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/util.c,v 1.5 1996/12/12 16:22:20 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/util.c,v 1.6 1997/07/25 20:12:28 mickey Exp $ (LBL)"; #endif #include <sys/types.h> @@ -36,7 +36,7 @@ static const char rcsid[] = #endif #include <pcap.h> #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -158,7 +158,7 @@ tok2str(register const struct tok *lp, register const char *fmt, /* VARARGS */ __dead void -#if __STDC__ +#ifdef __STDC__ error(const char *fmt, ...) #else error(fmt, va_alist) @@ -169,7 +169,7 @@ error(fmt, va_alist) va_list ap; (void)fprintf(stderr, "%s: ", program_name); -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); @@ -187,7 +187,7 @@ error(fmt, va_alist) /* VARARGS */ void -#if __STDC__ +#ifdef __STDC__ warning(const char *fmt, ...) #else warning(fmt, va_alist) @@ -198,7 +198,7 @@ warning(fmt, va_alist) va_list ap; (void)fprintf(stderr, "%s: WARNING: ", program_name); -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.sbin/tcpdump/vfprintf.c b/usr.sbin/tcpdump/vfprintf.c index d525e311fe9..6f436025a47 100644 --- a/usr.sbin/tcpdump/vfprintf.c +++ b/usr.sbin/tcpdump/vfprintf.c @@ -21,13 +21,13 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/Attic/vfprintf.c,v 1.1 1996/12/12 16:23:04 bitblt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/Attic/vfprintf.c,v 1.2 1997/07/25 20:12:29 mickey Exp $ (LBL)"; #endif #include <sys/types.h> #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> 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 *); |