Re: bad change to ginclude/va-alpha.h

["Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>]

 > From: Weiwen Liu <weiwen.liu@yale.edu>
 > Subject: Re: bad change to ginclude/va-alpha.h
 > 
 > I bootstrapped on an osf4.0d machine.
 > Here is the error message:
 > 
 > stage1/xgcc -Bstage1/ -c  -DIN_GCC    -W -Wall -O4 -O4 -funroll-loops
 > -DHAVE_CONFIG_H -DHAIFA    -I. -I../../gcc -I../../gcc/config
 > ../../gcc/gen-protos.c
 > In file included from include/stdarg.h:36,
 >                  from ../../gcc/cpplib.h:26,
 >                  from ../../gcc/gen-protos.c:22:
 > include/va-alpha.h:31: conflicting types for `va_list'
 > /usr/include/va_list.h:71: previous declaration of `va_list'
 > ../../gcc/gen-protos.c: In function `parse_fn_proto':
 > ../../gcc/gen-protos.c:113: warning: subscript has type `char'
 > ../../gcc/gen-protos.c:122: warning: subscript has type `char'
 > ../../gcc/gen-protos.c: In function `main':
 > ../../gcc/gen-protos.c:143: warning: unused parameter `argc'
 > ../../gcc/cpphash.h: At top level:
 > ../../gcc/cpphash.h:34: warning: `hashtab' defined but not used
 > make[1]: *** [gen-protos.o] Error 1



	I got a similar error bootstrapping the egcs trunk checked out
today (19980816) on my alphaev5-dec-osf4.0b box.  I also had the same
trouble on make other files besides gen-protos.c.  E.g., some of the
other files which include cpplib.h have this problem, as well as
cp/errfn.c and cp/tree.c and some files in objc/.

	I traced this to the known include file ordering problem
between inclusion of stdarg.h/varargs.h and stdio.h (which we get via
system.h).

	(For those that don't remember, stdio.h may try to include one
of the variable argument headers itself.  Its efforts may conflict
with the header that our gcc code attempts to get elsewhere.
Including one of stdarg.h/varargs.h before stdio.h ensures stdio.h
won't try to get one itself.)

	Most of the .c files in gcc include stdarg.h/varargs.h right
before system.h.  But cp.errfn.c and cp/tree.c don't follow this rule.
Also cpplib.h includes stdarg.h/varargs.h and cpplib.h is always
included after system.h (as all local headers should be.)

	While I could fix this separately in each file, I'd like to
fix this once and for all by including stdarg.h/varargs.h in system.h,
remove it from everywhere else and be done with it.

	The following patch takes care of these failures except for
the objc/ dir since the files making up libobjc.a don't include
system.h.  (Should they?  I thought they were to move into a toplevel
directory? ...)  Anyways, I'll look at doing those in another pass,
but for now I'd like to include the following patch into the trunk.
Is it okay to install?

		Thanks,
		--Kaveh


Sun Aug 16 14:06:27 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* system.h: Include stdarg.h/varargs.h, make sure they are ordered
 	correctly with regards to stdio.h.
	
	* calls.c: Remove stdarg.h/varargs.h.
	* cccp.c: Likewise.
	* cexp.y: Likewise.
	* combine.c: Likewise.
	* cpperror.c: Likewise.
	* cpplib.c: Likewise.
	* cpplib.h: Likewise.
	* doprint.c: Likewise.
	* emit-rtl.c: Likewise.
	* final.c: Likewise.
	* fix-header.c: Likewise.
	* gcc.c: Likewise.
	* genattr.c: Likewise.
	* genattrtab.c: Likewise.
	* gencodes.c: Likewise.
	* genconfig.c: Likewise.
	* genemit.c: Likewise.
	* genextract.c: Likewise.
	* genflags.c: Likewise.
	* genopinit.c: Likewise.
	* genoutput.c: Likewise.
	* genpeep.c: Likewise.
	* genrecog.c: Likewise.
	* mips-tfile.c: Likewise.
	* prefix.c: Likewise.
	* protoize.c: Likewise.
	* regmove.c: Likewise.
	* toplev.c: Likewise.
	* tree.c: Likewise.


diff -rup orig/egcs-CVS19980816/gcc/calls.c egcs-CVS19980816/gcc/calls.c
--- orig/egcs-CVS19980816/gcc/calls.c	Sun Aug 16 09:25:34 1998
+++ egcs-CVS19980816/gcc/calls.c	Sun Aug 16 13:26:58 1998
@@ -19,11 +19,6 @@ the Free Software Foundation, 59 Temple 
 Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "tree.h"
diff -rup orig/egcs-CVS19980816/gcc/cccp.c egcs-CVS19980816/gcc/cccp.c
--- orig/egcs-CVS19980816/gcc/cccp.c	Sun Aug 16 09:25:35 1998
+++ egcs-CVS19980816/gcc/cccp.c	Sun Aug 16 13:26:06 1998
@@ -19,11 +19,6 @@ Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA. */
 
 #include "config.h"
-#ifdef __STDC__
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
 
 #define PRINTF_PROTO(ARGS, m, n) PVPROTO (ARGS) ATTRIBUTE_PRINTF(m, n)
 
diff -rup orig/egcs-CVS19980816/gcc/cexp.y egcs-CVS19980816/gcc/cexp.y
--- orig/egcs-CVS19980816/gcc/cexp.y	Sun Aug 16 09:25:35 1998
+++ egcs-CVS19980816/gcc/cexp.y	Sun Aug 16 13:26:26 1998
@@ -26,11 +26,6 @@ Boston, MA 02111-1307, USA.
    
 %{
 #include "config.h"
-#ifdef __STDC__
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
 
 #define PRINTF_PROTO(ARGS, m, n) PVPROTO (ARGS) ATTRIBUTE_PRINTF(m, n)
 
diff -rup orig/egcs-CVS19980816/gcc/cexp.c egcs-CVS19980816/gcc/cexp.c
--- orig/egcs-CVS19980816/gcc/cexp.c	Sun Aug 16 09:34:58 1998
+++ egcs-CVS19980816/gcc/cexp.c	Sun Aug 16 13:26:36 1998
@@ -22,11 +22,6 @@
 #line 27 "cexp.y"
 
 #include "config.h"
-#ifdef __STDC__
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
 
 #define PRINTF_PROTO(ARGS, m, n) PVPROTO (ARGS) ATTRIBUTE_PRINTF(m, n)
 
diff -rup orig/egcs-CVS19980816/gcc/combine.c egcs-CVS19980816/gcc/combine.c
--- orig/egcs-CVS19980816/gcc/combine.c	Sun Aug 16 09:25:40 1998
+++ egcs-CVS19980816/gcc/combine.c	Sun Aug 16 13:30:02 1998
@@ -75,16 +75,8 @@ Boston, MA 02111-1307, USA.  */
    combine anyway.  */
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-/* stdio.h must precede rtl.h for FFS.  */
 #include "system.h"
-
-#include "rtl.h"
+#include "rtl.h" /* stdio.h must precede rtl.h for FFS.  */
 #include "flags.h"
 #include "regs.h"
 #include "hard-reg-set.h"
diff -rup orig/egcs-CVS19980816/gcc/cpperror.c egcs-CVS19980816/gcc/cpperror.c
--- orig/egcs-CVS19980816/gcc/cpperror.c	Sun Aug 16 09:25:49 1998
+++ egcs-CVS19980816/gcc/cpperror.c	Sun Aug 16 13:30:15 1998
@@ -24,11 +24,6 @@ Foundation, 59 Temple Place - Suite 330,
 
 #ifndef EMACS
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "gansidecl.h"
 #else
diff -rup orig/egcs-CVS19980816/gcc/cpplib.c egcs-CVS19980816/gcc/cpplib.c
--- orig/egcs-CVS19980816/gcc/cpplib.c	Sun Aug 16 09:25:51 1998
+++ egcs-CVS19980816/gcc/cpplib.c	Sun Aug 16 13:27:09 1998
@@ -19,11 +19,6 @@ along with this program; if not, write t
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 
 #ifndef STDC_VALUE
diff -rup orig/egcs-CVS19980816/gcc/cpplib.h egcs-CVS19980816/gcc/cpplib.h
--- orig/egcs-CVS19980816/gcc/cpplib.h	Sun Aug 16 09:25:51 1998
+++ egcs-CVS19980816/gcc/cpplib.h	Sun Aug 16 13:24:37 1998
@@ -22,11 +22,6 @@ Foundation, 59 Temple Place - Suite 330,
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
diff -rup orig/egcs-CVS19980816/gcc/doprint.c egcs-CVS19980816/gcc/doprint.c
--- orig/egcs-CVS19980816/gcc/doprint.c	Sun Aug 16 09:31:42 1998
+++ egcs-CVS19980816/gcc/doprint.c	Sun Aug 16 13:27:48 1998
@@ -4,11 +4,6 @@
  */
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "gansidecl.h"
 #undef _doprnt
diff -rup orig/egcs-CVS19980816/gcc/emit-rtl.c egcs-CVS19980816/gcc/emit-rtl.c
--- orig/egcs-CVS19980816/gcc/emit-rtl.c	Sun Aug 16 09:26:03 1998
+++ egcs-CVS19980816/gcc/emit-rtl.c	Sun Aug 16 13:27:29 1998
@@ -35,11 +35,6 @@ Boston, MA 02111-1307, USA.  */
    is the kind of rtx's they make and what arguments they use.  */
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "tree.h"
diff -rup orig/egcs-CVS19980816/gcc/final.c egcs-CVS19980816/gcc/final.c
--- orig/egcs-CVS19980816/gcc/final.c	Sun Aug 16 09:26:15 1998
+++ egcs-CVS19980816/gcc/final.c	Sun Aug 16 13:27:18 1998
@@ -45,11 +45,6 @@ Boston, MA 02111-1307, USA.  */
    FUNCTION_EPILOGUE.  Those instructions never exist as rtl.  */
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 
 #include "tree.h"
diff -rup orig/egcs-CVS19980816/gcc/fix-header.c egcs-CVS19980816/gcc/fix-header.c
--- orig/egcs-CVS19980816/gcc/fix-header.c	Sun Aug 16 09:26:16 1998
+++ egcs-CVS19980816/gcc/fix-header.c	Sun Aug 16 13:28:14 1998
@@ -71,11 +71,6 @@ Foundation, 59 Temple Place - Suite 330,
    Written by Per Bothner <bothner@cygnus.com>, July 1993.  */
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "gansidecl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/gcc.c egcs-CVS19980816/gcc/gcc.c
--- orig/egcs-CVS19980816/gcc/gcc.c	Sun Aug 16 09:26:27 1998
+++ egcs-CVS19980816/gcc/gcc.c	Sun Aug 16 13:28:27 1998
@@ -32,12 +32,6 @@ Once it knows which kind of compilation 
 compilation is specified by a string called a "spec".  */
 
 #include "config.h"
-
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include <signal.h>
 #include <sys/stat.h>
diff -rup orig/egcs-CVS19980816/gcc/genattr.c egcs-CVS19980816/gcc/genattr.c
--- orig/egcs-CVS19980816/gcc/genattr.c	Sun Aug 16 09:26:30 1998
+++ egcs-CVS19980816/gcc/genattr.c	Sun Aug 16 13:28:44 1998
@@ -21,11 +21,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/genattrtab.c egcs-CVS19980816/gcc/genattrtab.c
--- orig/egcs-CVS19980816/gcc/genattrtab.c	Sun Aug 16 09:27:26 1998
+++ egcs-CVS19980816/gcc/genattrtab.c	Sun Aug 16 13:29:06 1998
@@ -96,12 +96,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "hconfig.h"
-/* varargs must always be included after *config.h, but before stdio.h.  */
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "insn-config.h"	/* For REGISTER_CONSTRAINTS */
diff -rup orig/egcs-CVS19980816/gcc/gencodes.c egcs-CVS19980816/gcc/gencodes.c
--- orig/egcs-CVS19980816/gcc/gencodes.c	Sun Aug 16 09:27:26 1998
+++ egcs-CVS19980816/gcc/gencodes.c	Sun Aug 16 13:29:17 1998
@@ -23,11 +23,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/genconfig.c egcs-CVS19980816/gcc/genconfig.c
--- orig/egcs-CVS19980816/gcc/genconfig.c	Sun Aug 16 09:27:26 1998
+++ egcs-CVS19980816/gcc/genconfig.c	Sun Aug 16 13:30:30 1998
@@ -21,11 +21,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/genemit.c egcs-CVS19980816/gcc/genemit.c
--- orig/egcs-CVS19980816/gcc/genemit.c	Sun Aug 16 09:27:26 1998
+++ egcs-CVS19980816/gcc/genemit.c	Sun Aug 16 13:30:38 1998
@@ -20,11 +20,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/genextract.c egcs-CVS19980816/gcc/genextract.c
--- orig/egcs-CVS19980816/gcc/genextract.c	Sun Aug 16 09:27:26 1998
+++ egcs-CVS19980816/gcc/genextract.c	Sun Aug 16 13:31:02 1998
@@ -20,11 +20,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/genflags.c egcs-CVS19980816/gcc/genflags.c
--- orig/egcs-CVS19980816/gcc/genflags.c	Sun Aug 16 09:27:26 1998
+++ egcs-CVS19980816/gcc/genflags.c	Sun Aug 16 13:30:47 1998
@@ -23,11 +23,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/genopinit.c egcs-CVS19980816/gcc/genopinit.c
--- orig/egcs-CVS19980816/gcc/genopinit.c	Sun Aug 16 09:27:26 1998
+++ egcs-CVS19980816/gcc/genopinit.c	Sun Aug 16 13:31:10 1998
@@ -20,11 +20,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/genoutput.c egcs-CVS19980816/gcc/genoutput.c
--- orig/egcs-CVS19980816/gcc/genoutput.c	Sun Aug 16 09:27:26 1998
+++ egcs-CVS19980816/gcc/genoutput.c	Sun Aug 16 13:31:21 1998
@@ -91,11 +91,6 @@ It would not make an case in output_insn
 given in the entry is a constant (it does not start with `*').  */
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/genpeep.c egcs-CVS19980816/gcc/genpeep.c
--- orig/egcs-CVS19980816/gcc/genpeep.c	Sun Aug 16 09:27:27 1998
+++ egcs-CVS19980816/gcc/genpeep.c	Sun Aug 16 13:31:29 1998
@@ -20,11 +20,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/genrecog.c egcs-CVS19980816/gcc/genrecog.c
--- orig/egcs-CVS19980816/gcc/genrecog.c	Sun Aug 16 09:27:28 1998
+++ egcs-CVS19980816/gcc/genrecog.c	Sun Aug 16 13:31:43 1998
@@ -47,11 +47,6 @@ Boston, MA 02111-1307, USA.  */
    it returns the split rtl in a SEQUENCE.  */
 
 #include "hconfig.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include "rtl.h"
 #include "obstack.h"
diff -rup orig/egcs-CVS19980816/gcc/mips-tfile.c egcs-CVS19980816/gcc/mips-tfile.c
--- orig/egcs-CVS19980816/gcc/mips-tfile.c	Sun Aug 16 09:27:56 1998
+++ egcs-CVS19980816/gcc/mips-tfile.c	Sun Aug 16 13:31:54 1998
@@ -600,11 +600,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 
 #ifndef __SABER__
diff -rup orig/egcs-CVS19980816/gcc/prefix.c egcs-CVS19980816/gcc/prefix.c
--- orig/egcs-CVS19980816/gcc/prefix.c	Sun Aug 16 09:27:58 1998
+++ egcs-CVS19980816/gcc/prefix.c	Sun Aug 16 13:32:04 1998
@@ -64,11 +64,6 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #ifdef _WIN32
 #include <windows.h>
diff -rup orig/egcs-CVS19980816/gcc/protoize.c egcs-CVS19980816/gcc/protoize.c
--- orig/egcs-CVS19980816/gcc/protoize.c	Sun Aug 16 09:27:59 1998
+++ egcs-CVS19980816/gcc/protoize.c	Sun Aug 16 13:32:18 1998
@@ -57,11 +57,6 @@ Boston, MA 02111-1307, USA.  */
 #define _POSIX_SOURCE
 #endif
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include <sys/stat.h>
 #if ! defined (_WIN32) || defined (__CYGWIN32__)
diff -rup orig/egcs-CVS19980816/gcc/regmove.c egcs-CVS19980816/gcc/regmove.c
--- orig/egcs-CVS19980816/gcc/regmove.c	Sun Aug 16 09:28:03 1998
+++ egcs-CVS19980816/gcc/regmove.c	Sun Aug 16 13:33:12 1998
@@ -24,16 +24,8 @@ the Free Software Foundation, 675 Mass A
    instruction to avoid the move instruction.  */
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-/* stdio.h must precede rtl.h for FFS.  */
 #include "system.h"
-
-#include "rtl.h"
+#include "rtl.h" /* stdio.h must precede rtl.h for FFS.  */
 #include "insn-config.h"
 #include "recog.h"
 #include "output.h"
diff -rup orig/egcs-CVS19980816/gcc/system.h egcs-CVS19980816/gcc/system.h
--- orig/egcs-CVS19980816/gcc/system.h	Sun Aug 16 09:28:19 1998
+++ egcs-CVS19980816/gcc/system.h	Sun Aug 16 13:23:39 1998
@@ -7,6 +7,13 @@
 #ifndef __GCC_SYSTEM_H__
 #define __GCC_SYSTEM_H__
 
+/* We must include stdarg.h/varargs.h before stdio.h. */
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
 #include <stdio.h>
 
 /* Define a generic NULL if one hasn't already been defined.  */
diff -rup orig/egcs-CVS19980816/gcc/toplev.c egcs-CVS19980816/gcc/toplev.c
--- orig/egcs-CVS19980816/gcc/toplev.c	Sun Aug 16 09:28:23 1998
+++ egcs-CVS19980816/gcc/toplev.c	Sun Aug 16 13:33:32 1998
@@ -24,11 +24,6 @@ Boston, MA 02111-1307, USA.  */
    Error messages and low-level interface to malloc also handled here.  */
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #undef FLOAT /* This is for hpux. They should change hpux.  */
 #undef FFS  /* Some systems define this in param.h.  */
 #include "system.h"
diff -rup orig/egcs-CVS19980816/gcc/tree.c egcs-CVS19980816/gcc/tree.c
--- orig/egcs-CVS19980816/gcc/tree.c	Sun Aug 16 09:28:24 1998
+++ egcs-CVS19980816/gcc/tree.c	Sun Aug 16 13:33:46 1998
@@ -34,11 +34,6 @@ Boston, MA 02111-1307, USA.  */
    by all passes of the compiler.  */
 
 #include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "system.h"
 #include <setjmp.h>
 #include "flags.h"



Sun Aug 16 14:06:27 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* errfn.c: Remove stdarg.h/varargs.h.
	* tree.c: Likewise.

diff -rup orig/egcs-CVS19980816/gcc/cp/errfn.c egcs-CVS19980816/gcc/cp/errfn.c
--- orig/egcs-CVS19980816/gcc/cp/errfn.c	Sun Aug 16 09:24:55 1998
+++ egcs-CVS19980816/gcc/cp/errfn.c	Sun Aug 16 13:37:11 1998
@@ -24,12 +24,6 @@ Boston, MA 02111-1307, USA.  */
 #include "tree.h"
 #include "toplev.h"
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 /* cp_printer is the type of a function which converts an argument into
    a string for digestion by printf.  The cp_printer function should deal
    with all memory management; the functions in this file will not free
diff -rup orig/egcs-CVS19980816/gcc/cp/tree.c egcs-CVS19980816/gcc/cp/tree.c
--- orig/egcs-CVS19980816/gcc/cp/tree.c	Sun Aug 16 09:25:06 1998
+++ egcs-CVS19980816/gcc/cp/tree.c	Sun Aug 16 13:37:03 1998
@@ -28,12 +28,6 @@ Boston, MA 02111-1307, USA.  */
 #include "rtl.h"
 #include "toplev.h"
 
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 extern void compiler_error ();
 
 static tree get_identifier_list PROTO((tree));