jvspec.c/xmalloc

Kaveh R. Ghazi ghazi@caip.rutgers.edu
Tue Feb 2 17:42:00 GMT 1999


 > From: Mark Mitchell <mark@markmitchell.com>
 > 
 > Despite this ChangeLog:
 > 
 > Fri Nov 27 13:20:51 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 > 
 > 	* jvspec.c: Remove the xmalloc prototype.
 > 
 > I still had a hard time compiling jvspec.c because of an extant
 > xmalloc prototype.  Did it grow back? :-)
 > -- 
 > Mark Mitchell 			mark@markmitchell.com



	Indeed, I believe it did. :-)  It may have happened because
the egcs java tree and the cygnus one are branched and out of sync (?)

Anyway, this time instead of removing it, I made it match the one in
libiberty.h so it lives in the correct (but redundant) form.  This
should be acceptable for the cygnus java branch so we hopefully they can
be sync'ed up.  I installed the following patch into the trunk. 

		--Kaveh


===================================================================
RCS file: /cvs/egcs/egcs/gcc/java/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- egcs/gcc/java/ChangeLog     1999/02/02 12:20:34     1.124
+++ egcs/gcc/java/ChangeLog     1999/02/02 17:16:56     1.125
@@ -1,3 +1,8 @@
+Tue Feb  2 20:04:50 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * jvspec.c (xmalloc): Fix the prototype to match the one obtained
+       from libiberty.h
+
 Tue Feb  2 10:39:47 1999  Per Bothner  <bothner@cygnus.com>
 
        Optimize: `return (a ? b : c)' as: `if (a) return b; else return c;'.
===================================================================
RCS file: /cvs/egcs/egcs/gcc/java/jvspec.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- egcs/gcc/java/jvspec.c      1999/02/02 10:18:25     1.10
+++ egcs/gcc/java/jvspec.c      1999/02/02 17:16:58     1.11
@@ -1,6 +1,6 @@
  /* Specific flags and argument handling of the front-end of the 
    GNU compiler for the Java(TM) language.
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 97-98, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -61,7 +61,7 @@
 #define MATH_LIBRARY "-lm"
 #endif
 
-extern char *xmalloc PROTO((size_t));
+extern GENERIC_PTR xmalloc PROTO((size_t));
 extern int do_spec             PROTO((char *));
 extern char *input_filename;
 extern size_t input_filename_length;
--
Kaveh R. Ghazi			Engagement Manager / Project Services
ghazi@caip.rutgers.edu		Qwest Internet Solutions


More information about the Gcc-patches mailing list