* sys-protos.h (gethostid): Make return type `int' ifdef __alpha__.

	* gen-protos.c: Delete support for SYS_PROTO_OVERRIDES.
	* alpha/alpha.h (SYS_PROTO_OVERRIDES): Delete.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@12642 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index ff8dea1..1778a8e 100644 (file)
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -2253,7 +2253,3 @@ do {                                                      \
 #define HAS_INIT_SECTION
 #define LD_INIT_SWITCH "-init"
 #define LD_FINI_SWITCH "-fini"
-
-/* Define gethostid in unistd.h as returning an int, not a long.  */
-#define SYS_PROTO_OVERRIDES \
-  "extern int gethostid (void);",

diff --git a/gcc/gen-protos.c b/gcc/gen-protos.c
index 47cf87e..0284c18 100644 (file)
--- a/gcc/gen-protos.c
+++ b/gcc/gen-protos.c
@@ -25,15 +25,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 int verbose = 0;
 char *progname;
 
-/* Table of prototypes that override sys-protos.h.  */
-static char *overrides[] =
-{
-#ifdef SYS_PROTO_OVERRIDES
-  SYS_PROTO_OVERRIDES
-#endif
-  0
-};
-
 #define HASH_SIZE 2503 /* a prime */
 int hash_tab[HASH_SIZE];
 int next_index;
@@ -171,29 +162,6 @@ main (argc, argv)
   fprintf (outf, "  {\"\", \"\", \"\"},\n");
   next_index = 1;
   
-  /* Output the overriding prototypes first so fix-header will use them
-     in preference to the default ones.  */
-  /* ??? Two copies of the prototype are output.  This doesn't cause any
-     problems, but one might wish to avoid outputting the second one.  */
-
-  for (optr = overrides; *optr; ++optr)
-    {
-      /* Using sstring's here may be overkill but parse_fn_proto modifies
-        the input string.  */
-      linebuf.ptr = linebuf.base;
-      make_sstring_space (&linebuf, strlen (*optr) + 1);
-      strcpy (linebuf.base, *optr);
-      linebuf.ptr = linebuf.base + strlen (*optr);
-
-      if (! parse_fn_proto (linebuf.base, linebuf.ptr, &fn_decl))
-       continue;
-
-      add_hash (fn_decl.fname);
-
-      fprintf (outf, "  {\"%s\", \"%s\", \"%s\"},\n",
-              fn_decl.fname, fn_decl.rtype, fn_decl.params);
-    }
-
   for (;;)
     {
       int c = skip_spaces (inf, ' ');

diff --git a/gcc/sys-protos.h b/gcc/sys-protos.h
index 566569d..ab6e407 100644 (file)
--- a/gcc/sys-protos.h
+++ b/gcc/sys-protos.h
@@ -449,7 +449,11 @@ extern int                    getgroups(int, gid_t *);
 extern struct hostent *       gethostbyaddr(/* ??? */);
 extern struct hostent *       gethostbyname(/* ??? */);
 extern struct hostent *       gethostent(/* ??? */);
+#ifdef __alpha__
+extern int                    gethostid(void);
+#else
 extern long                   gethostid(void);
+#endif
 extern int                    gethostname(char *, size_t);
 extern int                    getitimer(int, struct itimerval *);
 extern char *                 getlogin(void);