diff options
Diffstat (limited to 'lib/libc')
36 files changed, 96 insertions, 96 deletions
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c index e2465628673..e99660ea370 100644 --- a/lib/libc/compat-43/creat.c +++ b/lib/libc/compat-43/creat.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: creat.c,v 1.2 1996/08/19 08:19:18 tholo Exp $"; +static char *rcsid = "$OpenBSD: creat.c,v 1.3 1997/07/25 20:29:57 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <fcntl.h> int -#if __STDC__ +#ifdef __STDC__ creat(const char *path, mode_t mode) #else creat(path, mode) diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c index 3711ec4b572..17feea9d0f1 100644 --- a/lib/libc/compat-43/gethostid.c +++ b/lib/libc/compat-43/gethostid.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: gethostid.c,v 1.2 1996/08/19 08:19:23 tholo Exp $"; +static char *rcsid = "$OpenBSD: gethostid.c,v 1.3 1997/07/25 20:29:58 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> #include <sys/sysctl.h> -#if __STDC__ +#ifdef __STDC__ long gethostid(void) #else diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c index a6e262bda01..2be8dcc6f5d 100644 --- a/lib/libc/compat-43/killpg.c +++ b/lib/libc/compat-43/killpg.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: killpg.c,v 1.2 1996/08/19 08:19:27 tholo Exp $"; +static char *rcsid = "$OpenBSD: killpg.c,v 1.3 1997/07/25 20:29:58 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -43,7 +43,7 @@ static char *rcsid = "$OpenBSD: killpg.c,v 1.2 1996/08/19 08:19:27 tholo Exp $"; * Backwards-compatible killpg(). */ int -#if __STDC__ +#ifdef __STDC__ killpg(pid_t pgid, int sig) #else killpg(pgid, sig) diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c index acd3d606978..cb1d6a71d80 100644 --- a/lib/libc/compat-43/setpgrp.c +++ b/lib/libc/compat-43/setpgrp.c @@ -32,14 +32,14 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setpgrp.c,v 1.2 1996/08/19 08:19:29 tholo Exp $"; +static char *rcsid = "$OpenBSD: setpgrp.c,v 1.3 1997/07/25 20:29:59 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <unistd.h> int -#if __STDC__ +#ifdef __STDC__ setpgrp(pid_t pid, pid_t pgid) #else setpgrp(pid, pgid) diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c index 42418767eea..bea35e789af 100644 --- a/lib/libc/crypt/bcrypt.c +++ b/lib/libc/crypt/bcrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcrypt.c,v 1.8 1997/07/23 20:58:26 kstailey Exp $ */ +/* $OpenBSD: bcrypt.c,v 1.9 1997/07/25 20:29:59 mickey Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -97,7 +97,7 @@ const static u_int8_t index_64[128] = }; #define CHAR64(c) ( (c) > 127 ? 255 : index_64[(c)]) -#if __STDC__ +#ifdef __STDC__ static void decode_base64(u_int8_t *buffer, u_int16_t len, u_int8_t *data) #else diff --git a/lib/libc/crypt/blowfish.c b/lib/libc/crypt/blowfish.c index b9cd41f960f..9f1c79b0e73 100644 --- a/lib/libc/crypt/blowfish.c +++ b/lib/libc/crypt/blowfish.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.c,v 1.5 1997/07/23 20:58:27 kstailey Exp $ */ +/* $OpenBSD: blowfish.c,v 1.6 1997/07/25 20:30:00 mickey Exp $ */ /* * Blowfish block cipher for OpenBSD * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -441,7 +441,7 @@ Blowfish_initstate(c) } -#if __STDC__ +#ifdef __STDC__ u_int32_t Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current) #else diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c index f0eddfcb891..5749b3fada8 100644 --- a/lib/libc/gen/err.c +++ b/lib/libc/gen/err.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: err.c,v 1.3 1996/08/19 08:22:30 tholo Exp $"; +static char rcsid[] = "$OpenBSD: err.c,v 1.4 1997/07/25 20:30:01 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <err.h> @@ -52,7 +52,7 @@ _err(va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else int eval; diff --git a/lib/libc/gen/errx.c b/lib/libc/gen/errx.c index 16524e4237e..8f80294af8d 100644 --- a/lib/libc/gen/errx.c +++ b/lib/libc/gen/errx.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: errx.c,v 1.2 1996/08/19 08:22:36 tholo Exp $"; +static char rcsid[] = "$OpenBSD: errx.c,v 1.3 1997/07/25 20:30:02 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <err.h> @@ -44,7 +44,7 @@ static char rcsid[] = "$OpenBSD: errx.c,v 1.2 1996/08/19 08:22:36 tholo Exp $"; #endif __dead void -#if __STDC__ +#ifdef __STDC__ _errx(int eval, const char *fmt, ...) #else _errx(va_alist) @@ -52,7 +52,7 @@ _errx(va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else int eval; diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c index 0a921063b6b..10d79ac99a5 100644 --- a/lib/libc/gen/exec.c +++ b/lib/libc/gen/exec.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: exec.c,v 1.5 1996/12/05 05:37:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: exec.c,v 1.6 1997/07/25 20:30:01 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -44,7 +44,7 @@ static char rcsid[] = "$OpenBSD: exec.c,v 1.5 1996/12/05 05:37:10 deraadt Exp $" #include <stdio.h> #include <paths.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -87,7 +87,7 @@ buildargv(ap, arg, envpp) } int -#if __STDC__ +#ifdef __STDC__ execl(const char *name, const char *arg, ...) #else execl(name, arg, va_alist) @@ -100,7 +100,7 @@ execl(name, arg, va_alist) int sverrno; char **argv; -#if __STDC__ +#ifdef __STDC__ va_start(ap, arg); #else va_start(ap); @@ -115,7 +115,7 @@ execl(name, arg, va_alist) } int -#if __STDC__ +#ifdef __STDC__ execle(const char *name, const char *arg, ...) #else execle(name, arg, va_alist) @@ -128,7 +128,7 @@ execle(name, arg, va_alist) int sverrno; char **argv, **envp; -#if __STDC__ +#ifdef __STDC__ va_start(ap, arg); #else va_start(ap); @@ -143,7 +143,7 @@ execle(name, arg, va_alist) } int -#if __STDC__ +#ifdef __STDC__ execlp(const char *name, const char *arg, ...) #else execlp(name, arg, va_alist) @@ -156,7 +156,7 @@ execlp(name, arg, va_alist) int sverrno; char **argv; -#if __STDC__ +#ifdef __STDC__ va_start(ap, arg); #else va_start(ap); diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c index 0c2722b64c4..42013e8e916 100644 --- a/lib/libc/gen/ftok.c +++ b/lib/libc/gen/ftok.c @@ -26,7 +26,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: ftok.c,v 1.3 1996/08/19 08:22:54 tholo Exp $"; +static char *rcsid = "$OpenBSD: ftok.c,v 1.4 1997/07/25 20:30:02 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -34,7 +34,7 @@ static char *rcsid = "$OpenBSD: ftok.c,v 1.3 1996/08/19 08:22:54 tholo Exp $"; #include <sys/ipc.h> key_t -#if __STDC__ +#ifdef __STDC__ ftok(const char *path, char id) #else ftok(path, id) diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c index e146c19833b..398743fa1b6 100644 --- a/lib/libc/gen/setdomainname.c +++ b/lib/libc/gen/setdomainname.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: setdomainname.c,v 1.2 1996/08/19 08:25:45 tholo Exp $"; +static char rcsid[] = "$OpenBSD: setdomainname.c,v 1.3 1997/07/25 20:30:03 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> #include <sys/sysctl.h> -#if __STDC__ +#ifdef __STDC__ int setdomainname(const char *name, int namelen) #else diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c index 4554b5a110b..c9786b41c34 100644 --- a/lib/libc/gen/sethostname.c +++ b/lib/libc/gen/sethostname.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: sethostname.c,v 1.2 1996/08/19 08:25:48 tholo Exp $"; +static char rcsid[] = "$OpenBSD: sethostname.c,v 1.3 1997/07/25 20:30:03 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> #include <sys/sysctl.h> -#if __STDC__ +#ifdef __STDC__ int sethostname(const char *name, int namelen) #else diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c index f5f41277202..c13720e8cd3 100644 --- a/lib/libc/gen/setmode.c +++ b/lib/libc/gen/setmode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setmode.c,v 1.6 1997/07/23 21:04:07 kstailey Exp $ */ +/* $OpenBSD: setmode.c,v 1.7 1997/07/25 20:30:04 mickey Exp $ */ /* $NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94"; #else -static char rcsid[] = "$OpenBSD: setmode.c,v 1.6 1997/07/23 21:04:07 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: setmode.c,v 1.7 1997/07/25 20:30:04 mickey Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -86,7 +86,7 @@ static void dumpmode __P((BITCMD *)); * bits) followed by a '+' (set bits). */ mode_t -#if __STDC__ +#ifdef __STDC__ getmode(const void *bbox, mode_t omode) #else getmode(bbox, omode) diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c index 7e5a7319d0e..731c621461c 100644 --- a/lib/libc/gen/setproctitle.c +++ b/lib/libc/gen/setproctitle.c @@ -30,7 +30,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: setproctitle.c,v 1.4 1996/10/23 17:15:44 millert Exp $"; +static char rcsid[] = "$OpenBSD: setproctitle.c,v 1.5 1997/07/25 20:30:03 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: setproctitle.c,v 1.4 1996/10/23 17:15:44 miller extern char *__progname; /* Program name, from crt0. */ void -#if __STDC__ +#ifdef __STDC__ setproctitle(const char *fmt, ...) #else setproctitle(fmt, va_alist) @@ -68,7 +68,7 @@ setproctitle(fmt, va_alist) static char buf[MAX_PROCTITLE], *bufp = buf; int used; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c index cc56cdef0d6..27af209ff36 100644 --- a/lib/libc/gen/syslog.c +++ b/lib/libc/gen/syslog.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: syslog.c,v 1.3 1997/07/09 00:28:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: syslog.c,v 1.4 1997/07/25 20:30:04 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -49,7 +49,7 @@ static char rcsid[] = "$OpenBSD: syslog.c,v 1.3 1997/07/09 00:28:24 millert Exp #include <time.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -68,7 +68,7 @@ extern char *__progname; /* Program name, from crt0. */ * print message on log file; output is intended for syslogd(8). */ void -#if __STDC__ +#ifdef __STDC__ syslog(int pri, const char *fmt, ...) #else syslog(pri, fmt, va_alist) @@ -79,7 +79,7 @@ syslog(pri, fmt, va_alist) { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c index db92e7eea6d..c494c1c1965 100644 --- a/lib/libc/gen/unvis.c +++ b/lib/libc/gen/unvis.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: unvis.c,v 1.5 1997/07/09 00:28:26 millert Exp $"; +static char rcsid[] = "$OpenBSD: unvis.c,v 1.6 1997/07/25 20:30:05 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -56,7 +56,7 @@ static char rcsid[] = "$OpenBSD: unvis.c,v 1.5 1997/07/09 00:28:26 millert Exp $ * unvis - decode characters previously encoded by vis */ int -#if __STDC__ +#ifdef __STDC__ unvis(char *cp, char c, int *astate, int flag) #else unvis(cp, c, astate, flag) diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c index 2b755bf1605..0859957bde7 100644 --- a/lib/libc/gen/vis.c +++ b/lib/libc/gen/vis.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: vis.c,v 1.3 1997/07/09 00:28:26 millert Exp $"; +static char rcsid[] = "$OpenBSD: vis.c,v 1.4 1997/07/25 20:30:05 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -77,7 +77,7 @@ vis(dst, c, flag, nextc) *dst++ = '\\'; *dst++ = 'b'; goto done; -#if __STDC__ +#ifdef __STDC__ case '\a': #else case '\007': diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c index 605992c984f..87b485fdba0 100644 --- a/lib/libc/gen/waitpid.c +++ b/lib/libc/gen/waitpid.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: waitpid.c,v 1.2 1996/08/19 08:27:46 tholo Exp $"; +static char rcsid[] = "$OpenBSD: waitpid.c,v 1.3 1997/07/25 20:30:06 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -41,7 +41,7 @@ static char rcsid[] = "$OpenBSD: waitpid.c,v 1.2 1996/08/19 08:27:46 tholo Exp $ #include <sys/resource.h> pid_t -#if __STDC__ +#ifdef __STDC__ waitpid(pid_t pid, int *istat, int options) #else waitpid(pid, istat, options) diff --git a/lib/libc/gen/warn.c b/lib/libc/gen/warn.c index 203d74333cc..422d94b2059 100644 --- a/lib/libc/gen/warn.c +++ b/lib/libc/gen/warn.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: warn.c,v 1.2 1996/08/19 08:27:48 tholo Exp $"; +static char rcsid[] = "$OpenBSD: warn.c,v 1.3 1997/07/25 20:30:06 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <err.h> @@ -52,7 +52,7 @@ _warn(va_alist) #endif { va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else const char *fmt; diff --git a/lib/libc/net/htons.c b/lib/libc/net/htons.c index e647d8c91e4..47cf25952db 100644 --- a/lib/libc/net/htons.c +++ b/lib/libc/net/htons.c @@ -4,7 +4,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: htons.c,v 1.5 1996/12/12 03:19:55 tholo Exp $"; +static char *rcsid = "$OpenBSD: htons.c,v 1.6 1997/07/25 20:30:07 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -13,7 +13,7 @@ static char *rcsid = "$OpenBSD: htons.c,v 1.5 1996/12/12 03:19:55 tholo Exp $"; #undef htons u_int16_t -#if __STDC__ +#ifdef __STDC__ htons(u_int16_t x) #else htons(x) diff --git a/lib/libc/net/ntohs.c b/lib/libc/net/ntohs.c index 129729aa323..cf6414d4a63 100644 --- a/lib/libc/net/ntohs.c +++ b/lib/libc/net/ntohs.c @@ -4,7 +4,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: ntohs.c,v 1.5 1996/12/12 03:19:56 tholo Exp $"; +static char *rcsid = "$OpenBSD: ntohs.c,v 1.6 1997/07/25 20:30:07 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -13,7 +13,7 @@ static char *rcsid = "$OpenBSD: ntohs.c,v 1.5 1996/12/12 03:19:56 tholo Exp $"; #undef ntohs u_int16_t -#if __STDC__ +#ifdef __STDC__ ntohs(u_int16_t x) #else ntohs(x) diff --git a/lib/libc/net/res_random.c b/lib/libc/net/res_random.c index f3514542027..bd32a50c332 100644 --- a/lib/libc/net/res_random.c +++ b/lib/libc/net/res_random.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_random.c,v 1.6 1997/04/30 05:57:03 tholo Exp $ */ +/* $OpenBSD: res_random.c,v 1.7 1997/07/25 20:30:08 mickey Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -100,7 +100,7 @@ static void res_initid __P((void)); * of 0 - (mod-1) */ -#if __STDC__ +#ifdef __STDC__ static u_int16_t pmod(u_int16_t gen, u_int16_t exp, u_int16_t mod) #else diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c index 838b71fba1e..2d7a793c3c4 100644 --- a/lib/libc/stdio/fprintf.c +++ b/lib/libc/stdio/fprintf.c @@ -35,18 +35,18 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: fprintf.c,v 1.2 1996/08/19 08:32:41 tholo Exp $"; +static char rcsid[] = "$OpenBSD: fprintf.c,v 1.3 1997/07/25 20:30:09 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif int -#if __STDC__ +#ifdef __STDC__ fprintf(FILE *fp, const char *fmt, ...) #else fprintf(fp, fmt, va_alist) @@ -58,7 +58,7 @@ fprintf(fp, fmt, va_alist) int ret; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c index 3ea6b6ad79e..33b7e8a6a62 100644 --- a/lib/libc/stdio/fscanf.c +++ b/lib/libc/stdio/fscanf.c @@ -35,17 +35,17 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: fscanf.c,v 1.2 1996/08/19 08:32:45 tholo Exp $"; +static char rcsid[] = "$OpenBSD: fscanf.c,v 1.3 1997/07/25 20:30:09 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif -#if __STDC__ +#ifdef __STDC__ fscanf(FILE *fp, char const *fmt, ...) { int ret; va_list ap; diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c index 354409b6c61..6b9eb87d895 100644 --- a/lib/libc/stdio/funopen.c +++ b/lib/libc/stdio/funopen.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: funopen.c,v 1.2 1996/08/19 08:32:48 tholo Exp $"; +static char rcsid[] = "$OpenBSD: funopen.c,v 1.3 1997/07/25 20:30:09 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> @@ -46,7 +46,7 @@ FILE * funopen(cookie, readfn, writefn, seekfn, closefn) const void *cookie; int (*readfn)(), (*writefn)(); -#if __STDC__ +#ifdef __STDC__ fpos_t (*seekfn)(void *cookie, fpos_t off, int whence); #else fpos_t (*seekfn)(); diff --git a/lib/libc/stdio/fvwrite.h b/lib/libc/stdio/fvwrite.h index db9b6fcc283..bd7bcde8e9c 100644 --- a/lib/libc/stdio/fvwrite.h +++ b/lib/libc/stdio/fvwrite.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fvwrite.h,v 1.2 1996/08/19 08:32:49 tholo Exp $ */ +/* $OpenBSD: fvwrite.h,v 1.3 1997/07/25 20:30:10 mickey Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -49,7 +49,7 @@ struct __suio { int uio_resid; }; -#if __STDC__ || c_plusplus +#if defined(__STDC__) || defined(c_plusplus) extern int __sfvwrite(FILE *, struct __suio *); #else extern int __sfvwrite(); diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c index 74a7d8e5a1d..bdae6aec7ce 100644 --- a/lib/libc/stdio/printf.c +++ b/lib/libc/stdio/printf.c @@ -35,18 +35,18 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: printf.c,v 1.2 1996/08/19 08:32:57 tholo Exp $"; +static char rcsid[] = "$OpenBSD: printf.c,v 1.3 1997/07/25 20:30:10 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif int -#if __STDC__ +#ifdef __STDC__ printf(char const *fmt, ...) #else printf(fmt, va_alist) @@ -57,7 +57,7 @@ printf(fmt, va_alist) int ret; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c index 9fffc26073c..dd73700832d 100644 --- a/lib/libc/stdio/scanf.c +++ b/lib/libc/stdio/scanf.c @@ -35,17 +35,17 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: scanf.c,v 1.2 1996/08/19 08:33:03 tholo Exp $"; +static char rcsid[] = "$OpenBSD: scanf.c,v 1.3 1997/07/25 20:30:10 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif -#if __STDC__ +#ifdef __STDC__ scanf(char const *fmt, ...) #else scanf(fmt, va_alist) @@ -56,7 +56,7 @@ scanf(fmt, va_alist) int ret; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c index 86a740dda03..cab4690cd3b 100644 --- a/lib/libc/stdio/snprintf.c +++ b/lib/libc/stdio/snprintf.c @@ -35,17 +35,17 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: snprintf.c,v 1.2 1996/08/19 08:33:06 tholo Exp $"; +static char rcsid[] = "$OpenBSD: snprintf.c,v 1.3 1997/07/25 20:30:11 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> #endif -#if __STDC__ +#ifdef __STDC__ snprintf(char *str, size_t n, char const *fmt, ...) #else snprintf(str, n, fmt, va_alist) @@ -61,7 +61,7 @@ snprintf(str, n, fmt, va_alist) if ((int)n < 1) return (EOF); -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c index 4b831ac3028..16b99a27f97 100644 --- a/lib/libc/stdio/sprintf.c +++ b/lib/libc/stdio/sprintf.c @@ -35,11 +35,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: sprintf.c,v 1.2 1996/08/19 08:33:06 tholo Exp $"; +static char rcsid[] = "$OpenBSD: sprintf.c,v 1.3 1997/07/25 20:30:11 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: sprintf.c,v 1.2 1996/08/19 08:33:06 tholo Exp $ #include "local.h" int -#if __STDC__ +#ifdef __STDC__ sprintf(char *str, char const *fmt, ...) #else sprintf(str, fmt, va_alist) @@ -64,7 +64,7 @@ sprintf(str, fmt, va_alist) f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = INT_MAX; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c index bf314a65a50..eb249fbf65e 100644 --- a/lib/libc/stdio/sscanf.c +++ b/lib/libc/stdio/sscanf.c @@ -35,12 +35,12 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: sscanf.c,v 1.2 1996/08/19 08:33:07 tholo Exp $"; +static char rcsid[] = "$OpenBSD: sscanf.c,v 1.3 1997/07/25 20:30:12 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> #include <string.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -58,7 +58,7 @@ eofread(cookie, buf, len) return (0); } -#if __STDC__ +#ifdef __STDC__ sscanf(const char *str, char const *fmt, ...) #else sscanf(str, fmt, va_alist) @@ -77,7 +77,7 @@ sscanf(str, fmt, va_alist) f._read = eofread; f._ub._base = NULL; f._lb._base = NULL; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index ecd7bb3910f..274f7b9d82f 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: vfprintf.c,v 1.6 1996/12/14 06:49:43 tholo Exp $"; +static char *rcsid = "$OpenBSD: vfprintf.c,v 1.7 1997/07/25 20:30:12 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -51,7 +51,7 @@ static char *rcsid = "$OpenBSD: vfprintf.c,v 1.6 1996/12/14 06:49:43 tholo Exp $ #include <string.h> #include <errno.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index 9531179e137..c0ad92062d4 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -35,13 +35,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: vfscanf.c,v 1.3 1996/09/15 09:31:46 tholo Exp $"; +static char rcsid[] = "$OpenBSD: vfscanf.c,v 1.4 1997/07/25 20:30:13 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> #include <stdlib.h> #include <ctype.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> diff --git a/lib/libc/string/strftime.c b/lib/libc/string/strftime.c index 21be6667b40..a72efb8cded 100644 --- a/lib/libc/string/strftime.c +++ b/lib/libc/string/strftime.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strftime.c,v 1.7 1996/10/28 16:53:28 tholo Exp $"; +static char *rcsid = "$OpenBSD: strftime.c,v 1.8 1997/07/25 20:30:14 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/localedef.h> @@ -296,7 +296,7 @@ _secs(t) } static int -#if __STDC__ +#ifdef __STDC__ _conv(int n, int digits, char pad) #else _conv(n, digits, pad) diff --git a/lib/libc/sys/semctl.c b/lib/libc/sys/semctl.c index a5529b5fbf5..49d1c0a0da9 100644 --- a/lib/libc/sys/semctl.c +++ b/lib/libc/sys/semctl.c @@ -30,14 +30,14 @@ */ #if defined(SYSLIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: semctl.c,v 1.3 1997/04/26 08:50:13 tholo Exp $"; +static char rcsid[] = "$OpenBSD: semctl.c,v 1.4 1997/07/25 20:30:14 mickey Exp $"; #endif /* SYSLIBC_SCCS and not lint */ #include <sys/types.h> #include <sys/ipc.h> #include <sys/sem.h> -#if __STDC__ +#ifdef __STDC__ int semctl(int semid, int semnum, int cmd, union semun semun) #else int semctl(semid, int semnum, cmd, semun) diff --git a/lib/libc/termios/tcsetpgrp.c b/lib/libc/termios/tcsetpgrp.c index 1b3dd9ed340..91d65fa84d7 100644 --- a/lib/libc/termios/tcsetpgrp.c +++ b/lib/libc/termios/tcsetpgrp.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: tcsetpgrp.c,v 1.2 1996/08/19 08:34:44 tholo Exp $"; +static char rcsid[] = "$OpenBSD: tcsetpgrp.c,v 1.3 1997/07/25 20:30:15 mickey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -40,7 +40,7 @@ static char rcsid[] = "$OpenBSD: tcsetpgrp.c,v 1.2 1996/08/19 08:34:44 tholo Exp #include <termios.h> int -#if __STDC__ +#ifdef __STDC__ tcsetpgrp(int fd, pid_t pgrp) #else tcsetpgrp(fd, pgrp) |