X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgen-protos.c;h=b8fa31bfe1c37933ab9e294c394346563aa56c03;hb=e899394fb23ac27aa81b27136052a13e7f2b840d;hp=96aeef9ed25302c753518bfd9ef46e86afaad900;hpb=66a335705b70f2298db21aa80369162c22a4c336;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/gen-protos.c b/gcc/gen-protos.c
index 96aeef9ed25..b8fa31bfe1c 100644
--- a/gcc/gen-protos.c
+++ b/gcc/gen-protos.c
@@ -1,6 +1,6 @@
 /* gen-protos.c - massages a list of prototypes, for use by fixproto.
    Copyright (C) 1993, 1994, 1995, 1996, 1998,
-   1999 Free Software Foundation, Inc.
+   1999, 2003, 2004 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -16,16 +16,17 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "hconfig.h"
+#include "bconfig.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "scan.h"
-#undef abort
+#include "errors.h"
 
 int verbose = 0;
-const char *progname;
 
-static void add_hash		PARAMS ((const char *));
-static int parse_fn_proto	PARAMS ((char *, char *, struct fn_decl *));
+static void add_hash (const char *);
+static int parse_fn_proto (char *, char *, struct fn_decl *);
 
 #define HASH_SIZE 2503 /* a prime */
 int hash_tab[HASH_SIZE];
@@ -33,8 +34,7 @@ int next_index;
 int collisions;
 
 static void
-add_hash (fname)
-     const char *fname;
+add_hash (const char *fname)
 {
   int i, i0;
 
@@ -47,8 +47,7 @@ add_hash (fname)
       for (;;)
 	{
 	  i = (i+1) % HASH_SIZE;
-	  if (i == i0)
-	    abort ();
+	  gcc_assert (i != i0);
 	  if (hash_tab[i] == 0)
 	    break;
 	}
@@ -65,9 +64,7 @@ add_hash (fname)
    The fields of FN point to the input string.  */
 
 static int
-parse_fn_proto (start, end, fn)
-     char *start, *end;
-     struct fn_decl *fn;
+parse_fn_proto (char *start, char *end, struct fn_decl *fn)
 {
   char *ptr;
   int param_nesting = 1;
@@ -129,12 +126,8 @@ parse_fn_proto (start, end, fn)
   return 1;
 }
 
-extern int main PARAMS ((int, char **));
-
 int
-main (argc, argv)
-     int argc ATTRIBUTE_UNUSED;
-     char **argv;
+main (int argc ATTRIBUTE_UNUSED, char **argv)
 {
   FILE *inf = stdin;
   FILE *outf = stdout;
@@ -153,7 +146,7 @@ main (argc, argv)
   /* A hash table entry of 0 means "unused" so reserve it.  */
   fprintf (outf, "  {\"\", \"\", \"\", 0},\n");
   next_index = 1;
-  
+
   for (;;)
     {
       int c = skip_spaces (inf, ' ');
@@ -190,6 +183,6 @@ main (argc, argv)
 
   fprintf (stderr, "gen-protos: %d entries %d collisions\n",
 	   next_index, collisions);
-  
+
   return 0;
 }