From 3923126b85f9e8a77cab9a41b5a62125acd5b4cd Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 19 Feb 2002 19:39:42 +0000 Subject: We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft. --- bin/csh/alloc.c | 10 +++------- bin/csh/csh.c | 10 +++------- bin/csh/dir.c | 10 +++------- bin/csh/dol.c | 10 +++------- bin/csh/error.c | 30 +++--------------------------- bin/csh/exec.c | 10 +++------- bin/csh/exp.c | 10 +++------- bin/csh/file.c | 10 +++------- bin/csh/func.c | 10 +++------- bin/csh/glob.c | 10 +++------- bin/csh/hist.c | 10 +++------- bin/csh/init.c | 10 +++------- bin/csh/lex.c | 10 +++------- bin/csh/misc.c | 10 +++------- bin/csh/parse.c | 10 +++------- bin/csh/proc.c | 10 +++------- bin/csh/sem.c | 10 +++------- bin/csh/set.c | 10 +++------- bin/csh/str.c | 10 +++------- bin/csh/time.c | 10 +++------- 20 files changed, 60 insertions(+), 160 deletions(-) (limited to 'bin/csh') diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c index 6a3efa83c91..4d13c86a133 100644 --- a/bin/csh/alloc.c +++ b/bin/csh/alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alloc.c,v 1.6 2001/06/25 10:03:48 art Exp $ */ +/* $OpenBSD: alloc.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: alloc.c,v 1.6 1995/03/21 09:02:23 cgd Exp $ */ /*- @@ -38,18 +38,14 @@ #if 0 static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: alloc.c,v 1.6 2001/06/25 10:03:48 art Exp $"; +static char rcsid[] = "$OpenBSD: alloc.c,v 1.7 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/csh.c b/bin/csh/csh.c index eecb80ab37b..4e5e8c5b86f 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: csh.c,v 1.16 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93"; #else -static char rcsid[] = "$OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: csh.c,v 1.16 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -60,11 +60,7 @@ static char rcsid[] = "$OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $" #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "proc.h" diff --git a/bin/csh/dir.c b/bin/csh/dir.c index 342f8cffcde..1f940916827 100644 --- a/bin/csh/dir.c +++ b/bin/csh/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: dir.c,v 1.6 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.6 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -48,11 +48,7 @@ static char rcsid[] = "$OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "dir.h" diff --git a/bin/csh/dol.c b/bin/csh/dol.c index a3432c4b291..316cf4b7467 100644 --- a/bin/csh/dol.c +++ b/bin/csh/dol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: dol.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: dol.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -48,11 +48,7 @@ static char rcsid[] = "$OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/error.c b/bin/csh/error.c index 982de021feb..e54f9a7a395 100644 --- a/bin/csh/error.c +++ b/bin/csh/error.c @@ -1,4 +1,4 @@ -/* $OpenBSD: error.c,v 1.3 2000/08/30 01:46:34 mickey Exp $ */ +/* $OpenBSD: error.c,v 1.4 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $ */ /*- @@ -38,18 +38,14 @@ #if 0 static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: error.c,v 1.3 2000/08/30 01:46:34 mickey Exp $"; +static char rcsid[] = "$OpenBSD: error.c,v 1.4 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" @@ -293,23 +289,13 @@ static char *errorlist[] = * e.g. in process. */ void -#ifdef __STDC__ seterror(int id, ...) -#else -seterror(id, va_alist) - int id; - va_dcl -#endif { if (seterr == 0) { char berr[BUFSIZ]; va_list va; -#ifdef __STDC__ va_start(va, id); -#else - va_start(va); -#endif if (id < 0 || id > sizeof(errorlist) / sizeof(errorlist[0])) id = ERR_INVALID; vsnprintf(berr, sizeof(berr), errorlist[id], va); @@ -338,13 +324,7 @@ seterror(id, va_alist) * place error unwinds are ever caught. */ void -#ifdef __STDC__ stderror(int id, ...) -#else -stderror(id, va_alist) - int id; - va_dcl -#endif { va_list va; register Char **v; @@ -371,11 +351,7 @@ stderror(id, va_alist) /* Old error. */ (void) fprintf(csherr, "%s.\n", seterr); else { -#ifdef __STDC__ va_start(va, id); -#else - va_start(va); -#endif (void) vfprintf(csherr, errorlist[id], va); va_end(va); (void) fprintf(csherr, ".\n"); diff --git a/bin/csh/exec.c b/bin/csh/exec.c index 59d8c05021a..02022d968ac 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: exec.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95"; #else -static char rcsid[] = "$OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: exec.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -51,11 +51,7 @@ static char rcsid[] = "$OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $" #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/exp.c b/bin/csh/exp.c index 862485423f0..fa41415703b 100644 --- a/bin/csh/exp.c +++ b/bin/csh/exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: exp.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: exp.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -49,11 +49,7 @@ static char rcsid[] = "$OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; #ifndef SHORT_STRINGS #include #endif /* SHORT_STRINGS */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/file.c b/bin/csh/file.c index 5f4c46545cf..303dac5cfaf 100644 --- a/bin/csh/file.c +++ b/bin/csh/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: file.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: file.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -55,11 +55,7 @@ static char rcsid[] = "$OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $" #ifndef SHORT_STRINGS #include #endif /* SHORT_STRINGS */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/func.c b/bin/csh/func.c index c64f90da9bc..625bb099fa3 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -1,4 +1,4 @@ -/* $OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: func.c,v 1.14 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: func.c,v 1.14 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -49,11 +49,7 @@ static char rcsid[] = "$OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $ #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/glob.c b/bin/csh/glob.c index cd3e1175002..24bb3e2b5a2 100644 --- a/bin/csh/glob.c +++ b/bin/csh/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: glob.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: glob.c,v 1.7 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -48,11 +48,7 @@ static char rcsid[] = "$OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $" #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/hist.c b/bin/csh/hist.c index a4dfa650281..856c7e3488b 100644 --- a/bin/csh/hist.c +++ b/bin/csh/hist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hist.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: hist.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: hist.c,v 1.7 1995/03/21 18:35:44 mycroft Exp $ */ /*- @@ -38,17 +38,13 @@ #if 0 static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: hist.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: hist.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/init.c b/bin/csh/init.c index ca60a6b2449..ec61f3bea0e 100644 --- a/bin/csh/init.c +++ b/bin/csh/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.3 1997/07/25 18:58:10 mickey Exp $ */ +/* $OpenBSD: init.c,v 1.4 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: init.c,v 1.6 1995/03/21 09:03:05 cgd Exp $ */ /*- @@ -38,15 +38,11 @@ #if 0 static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: init.c,v 1.3 1997/07/25 18:58:10 mickey Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.4 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/lex.c b/bin/csh/lex.c index 0c43487682c..c9b141c409b 100644 --- a/bin/csh/lex.c +++ b/bin/csh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: lex.c,v 1.6 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: lex.c,v 1.6 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -49,11 +49,7 @@ static char rcsid[] = "$OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/misc.c b/bin/csh/misc.c index 946680f7494..c5bb60565da 100644 --- a/bin/csh/misc.c +++ b/bin/csh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $ */ /*- @@ -38,18 +38,14 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/parse.c b/bin/csh/parse.c index ba347b595bf..7cd949554e1 100644 --- a/bin/csh/parse.c +++ b/bin/csh/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */ /*- @@ -38,18 +38,14 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/proc.c b/bin/csh/proc.c index 2d1a4b2dece..e4dbfaa0d7c 100644 --- a/bin/csh/proc.c +++ b/bin/csh/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: proc.c,v 1.15 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: proc.c,v 1.15 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -48,11 +48,7 @@ static char rcsid[] = "$OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $ #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "dir.h" diff --git a/bin/csh/sem.c b/bin/csh/sem.c index 9f1fad0c130..29e7bcd3165 100644 --- a/bin/csh/sem.c +++ b/bin/csh/sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: sem.c,v 1.11 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: sem.c,v 1.11 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -50,11 +50,7 @@ static char rcsid[] = "$OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $" #include #include #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "proc.h" diff --git a/bin/csh/set.c b/bin/csh/set.c index 37c052afb11..8d04fa3bf45 100644 --- a/bin/csh/set.c +++ b/bin/csh/set.c @@ -1,4 +1,4 @@ -/* $OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: set.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: set.c,v 1.8 1995/03/21 18:35:52 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: set.c,v 1.7 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -47,11 +47,7 @@ static char rcsid[] = "$OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; #ifndef SHORT_STRINGS #include #endif /* SHORT_STRINGS */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" diff --git a/bin/csh/str.c b/bin/csh/str.c index 09efefa53a1..d00a4fe2e67 100644 --- a/bin/csh/str.c +++ b/bin/csh/str.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str.c,v 1.4 1997/07/25 18:58:18 mickey Exp $ */ +/* $OpenBSD: str.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: str.c,v 1.4 1997/07/25 18:58:18 mickey Exp $"; +static char rcsid[] = "$OpenBSD: str.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -50,11 +50,7 @@ static char rcsid[] = "$OpenBSD: str.c,v 1.4 1997/07/25 18:58:18 mickey Exp $"; */ #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include #include "csh.h" diff --git a/bin/csh/time.c b/bin/csh/time.c index b37b87aacec..e1071abff96 100644 --- a/bin/csh/time.c +++ b/bin/csh/time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: time.c,v 1.7 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: time.c,v 1.8 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: time.c,v 1.7 1995/03/21 13:55:25 mycroft Exp $ */ /*- @@ -38,16 +38,12 @@ #if 0 static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: time.c,v 1.7 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: time.c,v 1.8 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include -#ifdef __STDC__ -# include -#else -# include -#endif +#include #include "csh.h" #include "extern.h" -- cgit v1.2.3