diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/file/file.h | 4 | ||||
| -rw-r--r-- | usr.bin/file/print.c | 18 | ||||
| -rw-r--r-- | usr.bin/id/id.c | 10 | ||||
| -rw-r--r-- | usr.bin/lex/flex.skl | 8 | ||||
| -rw-r--r-- | usr.bin/lex/flexdef.h | 6 | ||||
| -rw-r--r-- | usr.bin/lex/initscan.c | 10 | ||||
| -rw-r--r-- | usr.bin/lex/misc.c | 8 | ||||
| -rw-r--r-- | usr.bin/m4/misc.c | 10 | ||||
| -rw-r--r-- | usr.bin/mail/aux.c | 10 | ||||
| -rw-r--r-- | usr.bin/make/lst.h | 4 | ||||
| -rw-r--r-- | usr.bin/make/make.h | 4 | ||||
| -rw-r--r-- | usr.bin/make/parse.c | 10 | ||||
| -rw-r--r-- | usr.bin/make/util.c | 6 | ||||
| -rw-r--r-- | usr.bin/oldrdist/main.c | 10 | ||||
| -rw-r--r-- | usr.bin/oldrdist/server.c | 22 | ||||
| -rw-r--r-- | usr.bin/rlogin/rlogin.c | 8 | ||||
| -rw-r--r-- | usr.bin/rpcgen/rpc_hout.c | 16 | ||||
| -rw-r--r-- | usr.bin/rsh/rsh.c | 12 | ||||
| -rw-r--r-- | usr.bin/script/script.c | 10 | ||||
| -rw-r--r-- | usr.bin/sed/misc.c | 10 | ||||
| -rw-r--r-- | usr.bin/sup/src/scm.c | 4 | ||||
| -rw-r--r-- | usr.bin/sup/src/supfilesrv.c | 4 | ||||
| -rw-r--r-- | usr.bin/sup/src/supscan.c | 4 | ||||
| -rw-r--r-- | usr.bin/sup/src/time.h | 4 | ||||
| -rw-r--r-- | usr.bin/systat/main.c | 10 | ||||
| -rw-r--r-- | usr.bin/tr/tr.c | 10 | ||||
| -rw-r--r-- | usr.bin/tset/misc.c | 10 | ||||
| -rw-r--r-- | usr.bin/uniq/uniq.c | 10 |
28 files changed, 126 insertions, 126 deletions
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h index 579eec21f15..b09a8eccb10 100644 --- a/usr.bin/file/file.h +++ b/usr.bin/file/file.h @@ -1,4 +1,4 @@ -/* $OpenBSD: file.h,v 1.3 1997/02/09 23:58:23 millert Exp $ */ +/* $OpenBSD: file.h,v 1.4 1997/07/25 21:05:26 mickey Exp $ */ /* * file.h - definitions for file(1) program @@ -81,7 +81,7 @@ struct magic { #include <stdio.h> /* Include that here, to make sure __P gets defined */ #ifndef __P -# if __STDC__ || __cplusplus +# ifdef __STDC__ || __cplusplus # define __P(a) a # else # define __P(a) () diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c index 089d1f28422..533dbb02069 100644 --- a/usr.bin/file/print.c +++ b/usr.bin/file/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.3 1997/02/09 23:58:32 millert Exp $ */ +/* $OpenBSD: print.c,v 1.4 1997/07/25 21:05:26 mickey Exp $ */ /* * print.c - debugging printout routines @@ -30,7 +30,7 @@ #include <stdio.h> #include <errno.h> #include <string.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> @@ -41,7 +41,7 @@ #include "file.h" #ifndef lint -static char *moduleid = "$OpenBSD: print.c,v 1.3 1997/02/09 23:58:32 millert Exp $"; +static char *moduleid = "$OpenBSD: print.c,v 1.4 1997/07/25 21:05:26 mickey Exp $"; #endif /* lint */ #define SZOF(a) (sizeof(a) / sizeof(a[0])) @@ -123,7 +123,7 @@ ckfputs(str, fil) /*VARARGS*/ void -#if __STDC__ +#ifdef __STDC__ ckfprintf(FILE *f, const char *fmt, ...) #else ckfprintf(va_alist) @@ -131,7 +131,7 @@ ckfprintf(va_alist) #endif { va_list va; -#if __STDC__ +#ifdef __STDC__ va_start(va, fmt); #else FILE *f; @@ -151,7 +151,7 @@ ckfprintf(va_alist) */ /*VARARGS*/ void -#if __STDC__ +#ifdef __STDC__ error(const char *f, ...) #else error(va_alist) @@ -159,7 +159,7 @@ error(va_alist) #endif { va_list va; -#if __STDC__ +#ifdef __STDC__ va_start(va, f); #else const char *f; @@ -178,7 +178,7 @@ error(va_alist) /*VARARGS*/ void -#if __STDC__ +#ifdef __STDC__ magwarn(const char *f, ...) #else magwarn(va_alist) @@ -186,7 +186,7 @@ magwarn(va_alist) #endif { va_list va; -#if __STDC__ +#ifdef __STDC__ va_start(va, f); #else const char *f; diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index bf80a10766d..c00df3f8c73 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -1,4 +1,4 @@ -/* $OpenBSD: id.c,v 1.4 1997/06/30 06:22:18 deraadt Exp $ */ +/* $OpenBSD: id.c,v 1.5 1997/07/25 21:05:27 mickey Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)id.c 8.3 (Berkeley) 4/28/95";*/ -static char rcsid[] = "$OpenBSD: id.c,v 1.4 1997/06/30 06:22:18 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: id.c,v 1.5 1997/07/25 21:05:27 mickey Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -315,14 +315,14 @@ who(u) /* NOTREACHED */ } -#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) @@ -331,7 +331,7 @@ err(fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl index ad57eaf58ee..afcfd0847b6 100644 --- a/usr.bin/lex/flex.skl +++ b/usr.bin/lex/flex.skl @@ -1,9 +1,9 @@ -/* $OpenBSD: flex.skl,v 1.4 1996/12/10 22:22:00 millert Exp $ */ +/* $OpenBSD: flex.skl,v 1.5 1997/07/25 21:05:28 mickey Exp $ */ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /cvs/OpenBSD/src/usr.bin/lex/flex.skl,v 1.4 1996/12/10 22:22:00 millert Exp $ + * $Header: /cvs/OpenBSD/src/usr.bin/lex/flex.skl,v 1.5 1997/07/25 21:05:28 mickey Exp $ */ #define FLEX_SCANNER @@ -39,7 +39,7 @@ class istream; #else /* ! __cplusplus */ -#if __STDC__ +#ifdef __STDC__ #define YY_USE_PROTOS #define YY_USE_CONST @@ -359,7 +359,7 @@ static int yy_top_state YY_PROTO(( void )); #ifdef YY_MALLOC_DECL YY_MALLOC_DECL #else -#if __STDC__ +#ifdef __STDC__ #ifndef __cplusplus #include <stdlib.h> #endif diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h index de675407fee..a6c76e811e5 100644 --- a/usr.bin/lex/flexdef.h +++ b/usr.bin/lex/flexdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: flexdef.h,v 1.3 1996/07/13 22:21:59 millert Exp $ */ +/* $OpenBSD: flexdef.h,v 1.4 1997/07/25 21:05:28 mickey Exp $ */ /* flexdef - definitions file for flex */ @@ -28,7 +28,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* @(#) $Header: /cvs/OpenBSD/src/usr.bin/lex/flexdef.h,v 1.3 1996/07/13 22:21:59 millert Exp $ (LBL) */ +/* @(#) $Header: /cvs/OpenBSD/src/usr.bin/lex/flexdef.h,v 1.4 1997/07/25 21:05:28 mickey Exp $ (LBL) */ #include <stdio.h> #include <ctype.h> @@ -82,7 +82,7 @@ #endif #ifndef PROTO -#if __STDC__ +#ifdef __STDC__ #define PROTO(proto) proto #else #define PROTO(proto) () diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c index cd0c069913f..4c5351eee12 100644 --- a/usr.bin/lex/initscan.c +++ b/usr.bin/lex/initscan.c @@ -1,10 +1,10 @@ -/* $OpenBSD: initscan.c,v 1.4 1996/12/10 22:22:01 millert Exp $ */ +/* $OpenBSD: initscan.c,v 1.5 1997/07/25 21:05:29 mickey Exp $ */ #line 2 "scan.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /cvs/OpenBSD/src/usr.bin/lex/initscan.c,v 1.4 1996/12/10 22:22:01 millert Exp $ + * $Header: /cvs/OpenBSD/src/usr.bin/lex/initscan.c,v 1.5 1997/07/25 21:05:29 mickey Exp $ */ #define FLEX_SCANNER @@ -35,7 +35,7 @@ #else /* ! __cplusplus */ -#if __STDC__ +#ifdef __STDC__ #define YY_USE_PROTOS #define YY_USE_CONST @@ -1272,7 +1272,7 @@ char *yytext; * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /cvs/OpenBSD/src/usr.bin/lex/initscan.c,v 1.4 1996/12/10 22:22:01 millert Exp $ */ +/* $Header: /cvs/OpenBSD/src/usr.bin/lex/initscan.c,v 1.5 1997/07/25 21:05:29 mickey Exp $ */ #include "flexdef.h" #include "parse.h" @@ -1388,7 +1388,7 @@ static int yy_top_state YY_PROTO(( void )); #ifdef YY_MALLOC_DECL YY_MALLOC_DECL #else -#if __STDC__ +#ifdef __STDC__ #ifndef __cplusplus #include <stdlib.h> #endif diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c index d5d5843cf73..9ebc0cf28a4 100644 --- a/usr.bin/lex/misc.c +++ b/usr.bin/lex/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.3 1996/07/13 22:22:09 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.4 1997/07/25 21:05:30 mickey Exp $ */ /* misc - miscellaneous flex routines */ @@ -28,7 +28,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /cvs/OpenBSD/src/usr.bin/lex/misc.c,v 1.3 1996/07/13 22:22:09 millert Exp $ */ +/* $Header: /cvs/OpenBSD/src/usr.bin/lex/misc.c,v 1.4 1997/07/25 21:05:30 mickey Exp $ */ #include "flexdef.h" @@ -540,7 +540,7 @@ Char array[]; case 'r': return '\r'; case 't': return '\t'; -#if __STDC__ +#ifdef __STDC__ case 'a': return '\a'; case 'v': return '\v'; #else @@ -727,7 +727,7 @@ register int c; case '\r': return "\\r"; case '\t': return "\\t"; -#if __STDC__ +#ifdef __STDC__ case '\a': return "\\a"; case '\v': return "\\v"; #endif diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index da514c1fe60..cbc1087c7c2 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.4 1996/07/01 20:40:28 deraadt Exp $ */ +/* $OpenBSD: misc.c,v 1.5 1997/07/25 21:05:32 mickey Exp $ */ /* $NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.4 1996/07/01 20:40:28 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.5 1997/07/25 21:05:32 mickey Exp $"; #endif #endif /* not lint */ @@ -243,14 +243,14 @@ usage() exit(1); } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif void -#if __STDC__ +#ifdef __STDC__ oops(const char *fmt, ...) #else oops(fmt, va_alist) @@ -259,7 +259,7 @@ oops(fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/mail/aux.c b/usr.bin/mail/aux.c index ee06e67b5ba..49e5d642069 100644 --- a/usr.bin/mail/aux.c +++ b/usr.bin/mail/aux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aux.c,v 1.7 1997/07/14 00:24:24 millert Exp $ */ +/* $OpenBSD: aux.c,v 1.8 1997/07/25 21:05:33 mickey Exp $ */ /* $NetBSD: aux.c,v 1.5 1997/05/13 06:15:52 mikel Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: aux.c,v 1.7 1997/07/14 00:24:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: aux.c,v 1.8 1997/07/25 21:05:33 mickey Exp $"; #endif #endif /* not lint */ @@ -91,14 +91,14 @@ save2str(str, old) /* * Announce a fatal error and die. */ -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif void -#if __STDC__ +#ifdef __STDC__ panic(const char *fmt, ...) #else panic(fmt, va_alist) @@ -107,7 +107,7 @@ panic(fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h index 3f928128f54..a316a04a42e 100644 --- a/usr.bin/make/lst.h +++ b/usr.bin/make/lst.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lst.h,v 1.4 1996/11/30 21:08:58 millert Exp $ */ +/* $OpenBSD: lst.h,v 1.5 1997/07/25 21:05:34 mickey Exp $ */ /* $NetBSD: lst.h,v 1.7 1996/11/06 17:59:12 christos Exp $ */ /* @@ -50,7 +50,7 @@ #include <sprite.h> #include <sys/param.h> -#if __STDC__ +#ifdef __STDC__ #include <stdlib.h> #endif diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h index 5e4f5a51c15..bd31d44a502 100644 --- a/usr.bin/make/make.h +++ b/usr.bin/make/make.h @@ -1,4 +1,4 @@ -/* $OpenBSD: make.h,v 1.9 1997/04/28 01:52:39 millert Exp $ */ +/* $OpenBSD: make.h,v 1.10 1997/07/25 21:05:34 mickey Exp $ */ /* $NetBSD: make.h,v 1.15 1997/03/10 21:20:00 christos Exp $ */ /* @@ -73,7 +73,7 @@ # endif #endif -#if __STDC__ +#ifdef __STDC__ #include <stdlib.h> #include <unistd.h> #endif diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 8ecb4b28641..f2b8d73a4a4 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.14 1997/04/28 01:52:40 millert Exp $ */ +/* $OpenBSD: parse.c,v 1.15 1997/07/25 21:05:35 mickey Exp $ */ /* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */ /* @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.14 1997/04/28 01:52:40 millert Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.15 1997/07/25 21:05:35 mickey Exp $"; #endif #endif /* not lint */ @@ -89,7 +89,7 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.14 1997/04/28 01:52:40 millert Exp * Parse_MainName Returns a Lst of the main target to create. */ -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -310,7 +310,7 @@ ParseFindKeyword (str) */ /* VARARGS */ void -#if __STDC__ +#ifdef __STDC__ Parse_Error(int type, char *fmt, ...) #else Parse_Error(va_alist) @@ -318,7 +318,7 @@ Parse_Error(va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else int type; /* Error type (PARSE_WARNING, PARSE_FATAL) */ diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c index 929391b5c23..1d2c58fba97 100644 --- a/usr.bin/make/util.c +++ b/usr.bin/make/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.6 1997/04/01 07:28:26 millert Exp $ */ +/* $OpenBSD: util.c,v 1.7 1997/07/25 21:05:36 mickey Exp $ */ /* $NetBSD: util.c,v 1.10 1996/12/31 17:56:04 christos Exp $ */ /* @@ -6,14 +6,14 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: util.c,v 1.6 1997/04/01 07:28:26 millert Exp $"; +static char rcsid[] = "$OpenBSD: util.c,v 1.7 1997/07/25 21:05:36 mickey Exp $"; #endif #include <stdio.h> #include "make.h" #include <sys/param.h> -#if !__STDC__ +#ifndef __STDC__ # ifndef const # define const # endif diff --git a/usr.bin/oldrdist/main.c b/usr.bin/oldrdist/main.c index a4cd0a3f80f..c66251a469b 100644 --- a/usr.bin/oldrdist/main.c +++ b/usr.bin/oldrdist/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.7 1997/04/04 18:41:31 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.8 1997/07/25 21:05:36 mickey Exp $ */ /* * Copyright (c) 1983, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$OpenBSD: main.c,v 1.7 1997/04/04 18:41:31 deraadt Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.8 1997/07/25 21:05:36 mickey Exp $"; #endif /* not lint */ #include "defs.h" @@ -307,14 +307,14 @@ prnames(nl) printf(")\n"); } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif void -#if __STDC__ +#ifdef __STDC__ warn(const char *fmt, ...) #else warn(fmt, va_alist) @@ -324,7 +324,7 @@ warn(fmt, va_alist) { extern int yylineno; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/oldrdist/server.c b/usr.bin/oldrdist/server.c index 8de4fc7aee0..93994ad6336 100644 --- a/usr.bin/oldrdist/server.c +++ b/usr.bin/oldrdist/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.8 1997/02/09 19:24:59 deraadt Exp $ */ +/* $OpenBSD: server.c,v 1.9 1997/07/25 21:05:37 mickey Exp $ */ /* * Copyright (c) 1983, 1993 @@ -35,7 +35,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$OpenBSD: server.c,v 1.8 1997/02/09 19:24:59 deraadt Exp $"; +static char *rcsid = "$OpenBSD: server.c,v 1.9 1997/07/25 21:05:37 mickey Exp $"; #endif /* not lint */ #include <sys/wait.h> @@ -1398,14 +1398,14 @@ dospecial(cmd) ack(); } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif void -#if __STDC__ +#ifdef __STDC__ log(FILE *fp, const char *fmt, ...) #else log(fp, fmt, va_alist) @@ -1415,7 +1415,7 @@ log(fp, fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); @@ -1431,7 +1431,7 @@ log(fp, fmt, va_alist) } void -#if __STDC__ +#ifdef __STDC__ error(const char *fmt, ...) #else error(fmt, va_alist) @@ -1441,7 +1441,7 @@ error(fmt, va_alist) { static FILE *fp; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); @@ -1470,7 +1470,7 @@ error(fmt, va_alist) } void -#if __STDC__ +#ifdef __STDC__ fatal(const char *fmt, ...) #else fatal(fmt, va_alist) @@ -1480,7 +1480,7 @@ fatal(fmt, va_alist) { static FILE *fp; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); @@ -1568,7 +1568,7 @@ cleanup(signo) } static void -#if __STDC__ +#ifdef __STDC__ note(const char *fmt, ...) #else note(fmt, va_alist) @@ -1578,7 +1578,7 @@ note(fmt, va_alist) { static char buf[BUFSIZ]; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c index a27e00d2fa4..b10146f9a9e 100644 --- a/usr.bin/rlogin/rlogin.c +++ b/usr.bin/rlogin/rlogin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rlogin.c,v 1.14 1997/06/29 11:10:37 provos Exp $ */ +/* $OpenBSD: rlogin.c,v 1.15 1997/07/25 21:05:38 mickey Exp $ */ /* $NetBSD: rlogin.c,v 1.8 1995/10/05 09:07:22 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rlogin.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: rlogin.c,v 1.14 1997/06/29 11:10:37 provos Exp $"; +static char rcsid[] = "$OpenBSD: rlogin.c,v 1.15 1997/07/25 21:05:38 mickey Exp $"; #endif #endif /* not lint */ @@ -541,7 +541,7 @@ writer() } void -#if __STDC__ +#ifdef __STDC__ echo(register char c) #else echo(c) @@ -822,7 +822,7 @@ msg(str) #ifdef KERBEROS /* VARARGS */ void -#if __STDC__ +#ifdef __STDC__ warning(const char *fmt, ...) #else warning(fmt, va_alist) diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c index 1e6b8647606..fb48cb1aca1 100644 --- a/usr.bin/rpcgen/rpc_hout.c +++ b/usr.bin/rpcgen/rpc_hout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_hout.c,v 1.3 1996/09/15 08:52:41 tholo Exp $ */ +/* $OpenBSD: rpc_hout.c,v 1.4 1997/07/25 21:05:39 mickey Exp $ */ /* $NetBSD: rpc_hout.c,v 1.4 1995/06/11 21:49:55 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -116,17 +116,17 @@ char* name; int pointerp; { - f_print(fout,"#ifdef __cplusplus \n"); + f_print(fout,"#ifdef __cplusplus\n"); f_print(fout, "extern \"C\" bool_t xdr_%s(XDR *, %s%s);\n", name, name, pointerp ? ("*") : ""); - f_print(fout,"#elif __STDC__ \n"); + f_print(fout,"#elif defined(__STDC__)\n"); f_print(fout, "extern bool_t xdr_%s(XDR *, %s%s);\n", name, name, pointerp ? ("*") : ""); - f_print(fout,"#else /* Old Style C */ \n"); + f_print(fout,"#else /* Old Style C */\n"); f_print(fout, "bool_t xdr_%s();\n", name); - f_print(fout,"#endif /* Old Style C */ \n\n"); + f_print(fout,"#endif /* Old Style C */\n\n"); } @@ -285,10 +285,10 @@ pprogramdef(def) f_print(fout,"\n#ifdef __cplusplus\n"); ext="extern \"C\" "; }else if ( i== 1){ - f_print(fout,"\n#elif __STDC__\n"); + f_print(fout,"\n#elif defined(__STDC__)\n"); ext="extern " ; }else{ - f_print(fout,"\n#else /* Old Style C */ \n"); + f_print(fout,"\n#else /* Old Style C */\n"); ext="extern "; } @@ -305,7 +305,7 @@ pprogramdef(def) } } - f_print(fout,"#endif /* Old Style C */ \n"); + f_print(fout,"#endif /* Old Style C */\n"); } } diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c index dd4330c209b..5d43207bd7d 100644 --- a/usr.bin/rsh/rsh.c +++ b/usr.bin/rsh/rsh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsh.c,v 1.14 1997/06/29 11:10:34 provos Exp $ */ +/* $OpenBSD: rsh.c,v 1.15 1997/07/25 21:05:39 mickey Exp $ */ /*- * Copyright (c) 1983, 1990 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)rsh.c 5.24 (Berkeley) 7/1/91";*/ -static char rcsid[] = "$OpenBSD: rsh.c,v 1.14 1997/06/29 11:10:34 provos Exp $"; +static char rcsid[] = "$OpenBSD: rsh.c,v 1.15 1997/07/25 21:05:39 mickey Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -57,7 +57,7 @@ static char rcsid[] = "$OpenBSD: rsh.c,v 1.14 1997/06/29 11:10:34 provos Exp $"; #include <stdio.h> #include <errno.h> #include <string.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -417,7 +417,7 @@ sendsig(signo) #ifdef KERBEROS /* VARARGS */ void -#if __STDC__ +#ifdef __STDC__ warning(const char *fmt, ...) #else warning(va_alist) @@ -425,7 +425,7 @@ va_dcl #endif { va_list ap; -#if !__STDC__ +#ifndef __STDC__ char *fmt; #endif char myrealm[REALM_SZ]; @@ -433,7 +433,7 @@ va_dcl if (krb_get_lrealm(myrealm, 0) != KSUCCESS) return; (void)fprintf(stderr, "rsh: warning, using standard rsh: "); -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index eed65db4ed7..502dffcdd4d 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: script.c,v 1.5 1997/06/20 09:58:03 deraadt Exp $ */ +/* $OpenBSD: script.c,v 1.6 1997/07/25 21:05:40 mickey Exp $ */ /* $NetBSD: script.c,v 1.3 1994/12/21 08:55:43 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: script.c,v 1.5 1997/06/20 09:58:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: script.c,v 1.6 1997/07/25 21:05:40 mickey Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -247,14 +247,14 @@ done() 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) @@ -263,7 +263,7 @@ err(fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c index 0e9f44eee73..c70346b2155 100644 --- a/usr.bin/sed/misc.c +++ b/usr.bin/sed/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:39:07 deraadt Exp $ */ +/* $OpenBSD: misc.c,v 1.3 1997/07/25 21:05:41 mickey Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -39,7 +39,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; */ -static char *rcsid = "$OpenBSD: misc.c,v 1.2 1996/06/26 05:39:07 deraadt Exp $"; +static char *rcsid = "$OpenBSD: misc.c,v 1.3 1997/07/25 21:05:41 mickey Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -104,7 +104,7 @@ strregerror(errcode, preg) return (oe); } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -113,7 +113,7 @@ strregerror(errcode, preg) * Error reporting function */ void -#if __STDC__ +#ifdef __STDC__ err(int severity, const char *fmt, ...) #else err(severity, fmt, va_alist) @@ -123,7 +123,7 @@ err(severity, fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/sup/src/scm.c b/usr.bin/sup/src/scm.c index bd108827807..b7f096efb85 100644 --- a/usr.bin/sup/src/scm.c +++ b/usr.bin/sup/src/scm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scm.c,v 1.4 1997/04/01 07:35:22 todd Exp $ */ +/* $OpenBSD: scm.c,v 1.5 1997/07/25 21:05:42 mickey Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -159,7 +159,7 @@ #include <arpa/inet.h> #include <net/if.h> #include <netdb.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> diff --git a/usr.bin/sup/src/supfilesrv.c b/usr.bin/sup/src/supfilesrv.c index 50a6711430c..2731dd07b24 100644 --- a/usr.bin/sup/src/supfilesrv.c +++ b/usr.bin/sup/src/supfilesrv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supfilesrv.c,v 1.7 1997/04/01 07:35:43 todd Exp $ */ +/* $OpenBSD: supfilesrv.c,v 1.8 1997/07/25 21:05:42 mickey Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -147,7 +147,7 @@ #include <pwd.h> #include <grp.h> #include <fcntl.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> diff --git a/usr.bin/sup/src/supscan.c b/usr.bin/sup/src/supscan.c index 216e9042bb4..710a50ee9a4 100644 --- a/usr.bin/sup/src/supscan.c +++ b/usr.bin/sup/src/supscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supscan.c,v 1.5 1997/04/01 07:35:49 todd Exp $ */ +/* $OpenBSD: supscan.c,v 1.6 1997/07/25 21:05:43 mickey Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -82,7 +82,7 @@ #include <c.h> #include <netdb.h> #include <setjmp.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> diff --git a/usr.bin/sup/src/time.h b/usr.bin/sup/src/time.h index b1fa9e9aa13..304191c5a43 100644 --- a/usr.bin/sup/src/time.h +++ b/usr.bin/sup/src/time.h @@ -1,4 +1,4 @@ -/* $OpenBSD: time.h,v 1.2 1996/06/26 05:39:58 deraadt Exp $ */ +/* $OpenBSD: time.h,v 1.3 1997/07/25 21:05:43 mickey Exp $ */ /* * Copyright (c) 1991 Carnegie Mellon University @@ -69,7 +69,7 @@ struct tm { char *tm_zone; /* timezone abbreviation */ }; -#if __STDC__ || c_plusplus +#if defined(__STDC__) || defined(c_plusplus) extern struct tm *gmtime(const time_t *); extern struct tm *localtime(const time_t *); extern time_t mktime(const struct tm *); diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index ebfa4c358b4..9e7a411e06b 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.11 1997/06/23 22:21:47 millert Exp $ */ +/* $OpenBSD: main.c,v 1.12 1997/07/25 21:05:44 mickey Exp $ */ /* $NetBSD: main.c,v 1.8 1996/05/10 23:16:36 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: main.c,v 1.11 1997/06/23 22:21:47 millert Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.12 1997/07/25 21:05:44 mickey Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -280,13 +280,13 @@ die(signo) exit(0); } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif -#if __STDC__ +#ifdef __STDC__ void error(const char *fmt, ...) #else @@ -299,7 +299,7 @@ error(fmt, va_alist) va_list ap; char buf[255]; int oy, ox; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 4c089fe7c32..12e5cca1426 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tr.c,v 1.3 1997/01/15 23:43:24 millert Exp $ */ +/* $OpenBSD: tr.c,v 1.4 1997/07/25 21:05:45 mickey Exp $ */ /* $NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: tr.c,v 1.3 1997/01/15 23:43:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: tr.c,v 1.4 1997/07/25 21:05:45 mickey Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -266,14 +266,14 @@ usage() exit(1); } -#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) @@ -282,7 +282,7 @@ err(fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c index 80729beb22d..6f1790a6256 100644 --- a/usr.bin/tset/misc.c +++ b/usr.bin/tset/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:41:55 deraadt Exp $ */ +/* $OpenBSD: misc.c,v 1.3 1997/07/25 21:05:45 mickey Exp $ */ /* $NetBSD: misc.c,v 1.3 1994/12/07 05:08:09 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/9/93"; #endif -static char rcsid[] = "$OpenBSD: misc.c,v 1.2 1996/06/26 05:41:55 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.3 1997/07/25 21:05:45 mickey Exp $"; #endif /* not lint */ #include <fcntl.h> @@ -74,14 +74,14 @@ outc(c) (void)putc(c, stderr); } -#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) @@ -90,7 +90,7 @@ err(fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index 895b0f06a7e..440d3bd5850 100644 --- a/usr.bin/uniq/uniq.c +++ b/usr.bin/uniq/uniq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uniq.c,v 1.3 1997/01/15 23:43:28 millert Exp $ */ +/* $OpenBSD: uniq.c,v 1.4 1997/07/25 21:05:46 mickey Exp $ */ /* $NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: uniq.c,v 1.3 1997/01/15 23:43:28 millert Exp $"; +static char rcsid[] = "$OpenBSD: uniq.c,v 1.4 1997/07/25 21:05:46 mickey Exp $"; #endif /* not lint */ #include <errno.h> @@ -252,14 +252,14 @@ usage() exit(1); } -#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) @@ -268,7 +268,7 @@ err(fmt, va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); |