Remove some __STDC__ checks.

diff --git a/sbin/dump/cache.c b/sbin/dump/cache.c
index ef5126b..d6ce214 100644 (file)
--- a/sbin/dump/cache.c
+++ b/sbin/dump/cache.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  * 
  * $FreeBSD: src/sbin/dump/cache.c,v 1.1.2.1 2003/01/25 18:54:59 dillon Exp $
- * $DragonFly: src/sbin/dump/cache.c,v 1.5 2006/10/21 04:10:02 pavalos Exp $
  */
 /*
  * Block cache for dump
@@ -58,12 +57,11 @@
 
 #include <ctype.h>
 #include <stdio.h>
-#ifdef __STDC__
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#endif
+
 #include "dump.h"
 
 typedef struct Block {

diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 677a6d8..ef684b7 100644 (file)
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -32,7 +32,6 @@
  *
  * @(#)dumprmt.c       8.3 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/dump/dumprmt.c,v 1.14.2.1 2000/07/01 06:31:52 ps Exp $
- * $DragonFly: src/sbin/dump/dumprmt.c,v 1.13 2005/04/14 10:17:23 y0netan1 Exp $
  */
 
 #include <sys/param.h>
@@ -59,12 +58,10 @@
 #include <netdb.h>
 #include <pwd.h>
 #include <stdio.h>
-#ifdef __STDC__
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#endif
 
 #include "pathnames.h"
 #include "dump.h"

diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 10444d9..095b63c 100644 (file)
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -32,7 +32,6 @@
  *
  * @(#)itime.c 8.1 (Berkeley) 6/5/93
  * $FreeBSD: src/sbin/dump/itime.c,v 1.3.2.1 2001/08/01 06:29:35 obrien Exp $
- * $DragonFly: src/sbin/dump/itime.c,v 1.11 2006/10/21 04:10:02 pavalos Exp $
  */
 
 #include <sys/param.h>
@@ -47,10 +46,8 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-#ifdef __STDC__
 #include <stdlib.h>
 #include <string.h>
-#endif
 
 #include "dump.h"
 

diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 817b3c8..cc291bc 100644 (file)
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -32,7 +32,6 @@
  *
  * @(#)tape.c  8.4 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/dump/tape.c,v 1.12.2.3 2002/02/23 22:32:51 iedowse Exp $
- * $DragonFly: src/sbin/dump/tape.c,v 1.14 2005/08/28 04:35:12 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -57,13 +56,9 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
-#ifdef __STDC__
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#else
-int    write(), read();
-#endif
 
 #include "dump.h"
 

diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index cecc6a5..b70f6fa 100644 (file)
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -32,7 +32,6 @@
  *
  * @(#)traverse.c      8.7 (Berkeley) 6/15/95
  * $FreeBSD: src/sbin/dump/traverse.c,v 1.10.2.6 2003/04/14 20:10:35 johan Exp $
- * $DragonFly: src/sbin/dump/traverse.c,v 1.15 2006/10/21 04:10:02 pavalos Exp $
  */
 
 #include <sys/param.h>
@@ -53,11 +52,9 @@
 
 #include <ctype.h>
 #include <stdio.h>
-#ifdef __STDC__
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
-#endif
 
 #include "dump.h"
 

diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index 6c2ed2e..56b2efa 100644 (file)
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/fsck/fsutil.c,v 1.2.2.1 2001/08/01 05:47:55 obrien Exp $
- * $DragonFly: src/sbin/fsck/fsutil.c,v 1.6 2006/10/12 04:04:03 dillon Exp $
- *
- * $NetBSD: fsutil.c,v 1.7 1998/07/30 17:41:03 thorpej Exp $
  */
 
 #include <sys/cdefs.h>
@@ -43,11 +40,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <errno.h>
 #include <fstab.h>
 #include <err.h>

diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index 9b8ea42..324edbc 100644 (file)
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -31,7 +31,6 @@
  *
  * $NetBSD: main.c,v 1.10 1997/10/01 02:18:14 enami Exp $
  * $FreeBSD: src/sbin/fsck_msdosfs/main.c,v 1.4.2.1 2001/08/01 05:47:56 obrien Exp $
- * $DragonFly: src/sbin/fsck_msdosfs/main.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $
  */
 
 
@@ -43,11 +42,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #include "fsutil.h"
 #include "ext.h"

diff --git a/sbin/init/init.c b/sbin/init/init.c
index b7a7be5..4ed62a7 100644 (file)
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -36,7 +36,6 @@
  * @(#) Copyright (c) 1991, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)init.c  8.1 (Berkeley) 7/15/93
  * $FreeBSD: src/sbin/init/init.c,v 1.38.2.8 2001/10/22 11:27:32 des Exp $
- * $DragonFly: src/sbin/init/init.c,v 1.10 2007/11/25 18:10:07 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -63,11 +62,7 @@
 #include <sys/reboot.h>
 #include <err.h>
 
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #ifdef SECURE
 #include <pwd.h>

diff --git a/sbin/mkinitrd/mini_init/oinit.c b/sbin/mkinitrd/mini_init/oinit.c
index ff40fd5..1674564 100644 (file)
--- a/sbin/mkinitrd/mini_init/oinit.c
+++ b/sbin/mkinitrd/mini_init/oinit.c
@@ -36,7 +36,6 @@
  * @(#) Copyright (c) 1991, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)init.c  8.1 (Berkeley) 7/15/93
  * $FreeBSD: src/sbin/init/init.c,v 1.38.2.8 2001/10/22 11:27:32 des Exp $
- * $DragonFly: src/sbin/init/init.c,v 1.10 2007/11/25 18:10:07 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -62,11 +61,7 @@
 #include <sys/reboot.h>
 #include <err.h>
 
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #include "pathnames.h"
 

diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index aefaa0e..bf240ca 100644 (file)
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -67,11 +67,7 @@
 #include <sys/mman.h>
 #endif
 
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #include "mntopts.h"
 #include "defs.h"

diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 4c1564c..2add6c1 100644 (file)
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -671,11 +671,10 @@ struct icmp6stat {
 #define RTF_PROBEMTU   RTF_PROTO1
 
 #ifdef _KERNEL
-# ifdef __STDC__
 struct rtentry;
 struct rttimer;
 struct in6_multi;
-# endif
+
 void   icmp6_init (void);
 void   icmp6_paramerror (struct mbuf *, int);
 void   icmp6_error (struct mbuf *, int, int, int);

diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 74423d3..4221133 100644 (file)
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -32,7 +32,6 @@
  *
  *     @(#)mount.h     8.21 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/sys/mount.h,v 1.89.2.7 2003/04/04 20:35:57 tegge Exp $
- * $DragonFly: src/sys/sys/mount.h,v 1.47 2008/09/17 21:44:19 dillon Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
@@ -511,11 +510,9 @@ TAILQ_HEAD(mntlist, mount);        /* struct mntlist */
 /*
  * Operations supported on mounted file system.
  */
-#ifdef __STDC__
 struct nlookupdata;
 struct nlookupdata;
 struct mbuf;
-#endif
 
 typedef int vfs_mount_t(struct mount *mp, char *path, caddr_t data,
                                    struct ucred *cred);

diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 8ff4095..62eab43 100644 (file)
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -35,7 +35,6 @@
  *
  *     @(#)utsname.h   8.1 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/sys/utsname.h,v 1.7 1999/12/29 04:24:49 peter Exp $
- * $DragonFly: src/sys/sys/utsname.h,v 1.4 2006/05/20 02:42:13 dillon Exp $
  */
 
 #ifndef        _SYS_UTSNAME_H_
@@ -56,14 +55,10 @@ struct utsname {
 
 
 #ifndef _KERNEL
-#ifdef __STDC__
 __BEGIN_DECLS
 int    uname (struct utsname *);
 __END_DECLS
 #else
-extern int uname();
-#endif
-#else
 extern struct utsname utsname;
 #endif /* _KERNEL */
 

diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index 9881a8b..e911428 100644 (file)
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -3,7 +3,6 @@
 /* Scanner skeleton version:
  * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
  * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.4 1999/10/27 07:56:44 obrien Exp $
- * $DragonFly: src/usr.bin/lex/flex.skl,v 1.9 2008/10/16 01:52:32 swildner Exp $
  */
 
 #define FLEX_SCANNER
@@ -42,12 +41,9 @@ using namespace std;
 
 #include <unistd.h>
 
-#if __STDC__
-
 #define YY_USE_PROTOS
 #define YY_USE_CONST
 
-#endif /* __STDC__ */
 #endif /* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -357,16 +353,9 @@ static int yy_top_state YY_PROTO(( void ));
 #ifdef YY_MALLOC_DECL
 YY_MALLOC_DECL
 #else
-#if __STDC__
 #ifndef __cplusplus
 #include <stdlib.h>
 #endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */

diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index c3a7df7..052297d 100644 (file)
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -28,7 +28,6 @@
 
 /* @(#) $Header: /home/daffy/u0/vern/flex/RCS/flexdef.h,v 2.53 95/04/20 11:17:36 vern Exp $ (LBL) */
 /* $FreeBSD: src/usr.bin/lex/flexdef.h,v 1.5 1999/10/27 07:56:44 obrien Exp $ */
-/* $DragonFly: src/usr.bin/lex/flexdef.h,v 1.4 2005/08/04 17:31:22 drhodus Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
@@ -68,11 +67,7 @@
 #endif
 
 #ifndef PROTO
-#if __STDC__
 #define PROTO(proto) proto
-#else
-#define PROTO(proto) ()
-#endif
 #endif
 
 

diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index b792d83..75f5bb0 100644 (file)
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -4,7 +4,6 @@
 /* Scanner skeleton version:
  * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
  * $FreeBSD: src/usr.bin/lex/initscan.c,v 1.6 1999/10/27 07:56:45 obrien Exp $
- * $DragonFly: src/usr.bin/lex/initscan.c,v 1.5 2005/08/04 17:31:22 drhodus Exp $
  */
 
 #define FLEX_SCANNER
@@ -35,12 +34,9 @@
 
 #else  /* ! __cplusplus */
 
-#if __STDC__
-
 #define YY_USE_PROTOS
 #define YY_USE_CONST
 
-#endif /* __STDC__ */
 #endif /* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -1379,16 +1375,9 @@ static int yy_top_state YY_PROTO(( void ));
 #ifdef YY_MALLOC_DECL
 YY_MALLOC_DECL
 #else
-#if __STDC__
 #ifndef __cplusplus
 #include <stdlib.h>
 #endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */

diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index b13a198..91de1e5 100644 (file)
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -28,7 +28,6 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/misc.c,v 2.47 95/04/28 11:39:39 vern Exp $ */
 /* $FreeBSD: src/usr.bin/lex/misc.c,v 1.5 1999/10/27 07:56:45 obrien Exp $ */
-/* $DragonFly: src/usr.bin/lex/misc.c,v 1.4 2005/08/04 17:31:22 drhodus Exp $ */
 
 #include "flexdef.h"
 
@@ -513,14 +512,8 @@ Char myesc(Char *array)
                case 'n': return '\n';
                case 'r': return '\r';
                case 't': return '\t';
-
-#if __STDC__
                case 'a': return '\a';
                case 'v': return '\v';
-#else
-               case 'a': return '\007';
-               case 'v': return '\013';
-#endif
 
                case '0':
                case '1':
@@ -684,11 +677,8 @@ char *readable_form(int c)
                        case '\n': return "\\n";
                        case '\r': return "\\r";
                        case '\t': return "\\t";
-
-#if __STDC__
                        case '\a': return "\\a";
                        case '\v': return "\\v";
-#endif
 
                        default:
                                (void) sprintf( rform, "\\%.3o",

diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index f089c8a..713aa33 100644 (file)
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -36,7 +36,6 @@
  * @(#)skeleton.c      5.8 (Berkeley) 4/29/95
  *
  * $FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28.2.1 2001/07/19 05:46:39 peter Exp $
- * $DragonFly: src/usr.bin/yacc/skeleton.c,v 1.7 2008/07/12 16:52:48 mneumann Exp $
  */
 
 #include "defs.h"
@@ -64,11 +63,7 @@ const char *banner[] = {
     "#define yyclearin (yychar=(YYEMPTY))",
     "#define yyerrok (yyerrflag=0)",
     "#define YYRECOVERING() (yyerrflag!=0)",
-    "#if defined(__cplusplus) || __STDC__",
     "static int yygrowstack(void);",
-    "#else",
-    "static int yygrowstack();",
-    "#endif",
     NULL
 };
 
@@ -158,24 +153,14 @@ const char *body[] = {
     "#define YYERROR goto yyerrlab",
     "",
     "#ifndef YYPARSE_PARAM",
-    "#if defined(__cplusplus) || __STDC__",
     "#define YYPARSE_PARAM_ARG void",
     "#define YYPARSE_PARAM_DECL",
-    "#else     /* ! ANSI-C/C++ */",
-    "#define YYPARSE_PARAM_ARG",
-    "#define YYPARSE_PARAM_DECL",
-    "#endif    /* ANSI-C/C++ */",
     "#else     /* YYPARSE_PARAM */",
     "#ifndef YYPARSE_PARAM_TYPE",
     "#define YYPARSE_PARAM_TYPE void *",
     "#endif",
-    "#if defined(__cplusplus) || __STDC__",
     "#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM",
     "#define YYPARSE_PARAM_DECL",
-    "#else     /* ! ANSI-C/C++ */",
-    "#define YYPARSE_PARAM_ARG YYPARSE_PARAM",
-    "#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM;",
-    "#endif    /* ANSI-C/C++ */",
     "#endif    /* ! YYPARSE_PARAM */",
     "",
     "int",

diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 5c0b88e..6476391 100644 (file)
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -8,7 +8,6 @@
  *
  *
  * $FreeBSD: src/usr.sbin/mrouted/defs.h,v 1.12.2.1 2001/07/19 01:41:11 kris Exp $
- * $DragonFly: src/usr.sbin/mrouted/defs.h,v 1.6 2004/02/10 02:59:42 rob Exp $
  * defs.h,v 3.8.4.15 1998/03/01 02:51:42 fenner Exp
  */
 
@@ -95,13 +94,7 @@ typedef void (*ihfunc_t)(int, fd_set *);
 #define        DEL_ALL_ROUTES          1
                            /* for Deleting kernel table entries */
 
-/* obnoxious gcc gives an extraneous warning about this constant... */
-#if defined(__STDC__) || defined(__GNUC__)
 #define JAN_1970       2208988800UL    /* 1970 - 1900 in seconds */
-#else
-#define JAN_1970       2208988800L     /* 1970 - 1900 in seconds */
-#define const          /**/
-#endif
 
 #ifdef RSRR
 #define BIT_ZERO(X)      ((X) = 0)

diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 8be7886..b82ee65 100644 (file)
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -10,7 +10,6 @@
  * main.c,v 3.8.4.29 1998/03/01 01:49:00 fenner Exp
  *
  * $FreeBSD: src/usr.sbin/mrouted/main.c,v 1.16.2.4 2002/09/12 16:27:49 nectar Exp $
- * $DragonFly: src/usr.sbin/mrouted/main.c,v 1.5 2004/12/18 22:48:04 swildner Exp $
  */
 
 /*
@@ -25,11 +24,7 @@
 
 #include <err.h>
 #include "defs.h"
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <fcntl.h>
 #include <paths.h>
 

diff --git a/usr.sbin/mrouted/mtrace.h b/usr.sbin/mrouted/mtrace.h
index e67dbd0..5dc131e 100644 (file)
--- a/usr.sbin/mrouted/mtrace.h
+++ b/usr.sbin/mrouted/mtrace.h
@@ -81,9 +81,4 @@ struct tr_resp {
                        x = htonl(~((1 << (32 - (i))) - 1)); \
                        };
 
-#if defined(__STDC__) || defined(__GNUC__)
 #define JAN_1970       2208988800UL    /* 1970 - 1900 in seconds */
-#else
-#define JAN_1970       2208988800L     /* 1970 - 1900 in seconds */
-#define const          /**/
-#endif

diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 8982ff7..96734e6 100644 (file)
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,5 +1,4 @@
 /*     $FreeBSD: src/usr.sbin/route6d/route6d.c,v 1.2.2.5 2001/07/03 11:02:09 ume Exp $        */
-/*     $DragonFly: src/usr.sbin/route6d/route6d.c,v 1.8 2005/12/05 02:40:28 swildner Exp $     */
 /*     $KAME: route6d.c,v 1.64 2001/05/08 04:36:37 itojun Exp $        */
 
 /*
@@ -42,11 +41,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <syslog.h>
 #include <stddef.h>
 #include <errno.h>
@@ -3241,11 +3236,7 @@ fatal(const char *fmt, ...)
        va_list ap;
        char buf[1024];
 
-#ifdef __STDC__
        va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
        vsnprintf(buf, sizeof(buf), fmt, ap);
        perror(buf);
        syslog(LOG_ERR, "%s: %s", buf, strerror(errno));
@@ -3258,11 +3249,7 @@ tracet(int level, const char *fmt, ...)
 {
        va_list ap;
 
-#ifdef __STDC__
        va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
        if (level <= dflag) {
                fprintf(stderr, "%s: ", hms());
                vfprintf(stderr, fmt, ap);
@@ -3281,11 +3268,7 @@ trace(int level, const char *fmt, ...)
 {
        va_list ap;
 
-#ifdef __STDC__
        va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
        if (level <= dflag)
                vfprintf(stderr, fmt, ap);
        if (dflag) {