[patch 10/9] remove stale ifdefs in varray.c

Zack Weinberg zackw@panix.com
Mon Jan 16 16:37:00 GMT 2006


In the patch set I sent a couple weeks ago (starting with
http://gcc.gnu.org/ml/gcc-patches/2006-01/msg00391.html) I made varray.c
no longer used by generator programs, but I neglected to remove the
GENERATOR_FILE #ifdefs from that file.  This patch does just that.

Bootstrapped i686-linux; will apply as obvious if the rest of the patch
set gets approved.  (I believe that patches 4, 5, 6, 8, and 9 have been
approved; 2 and 7 were under discussion, but it has petered out with an
inconclusive result; 1 and 3 have attracted no commentary at all.  Note
that I will not apply anything until the entire patchset is approved; I
don't have time to rework the later patches to apply independently.)

zw

	* varray.c: Remove GENERATOR_FILE #ifdefs.

==================================================================
--- local/gen-rework-20060106/gcc/varray.c	(revision 109723)
+++ local/gen-rework-20060106/gcc/varray.c	(revision 109724)
@@ -1,5 +1,5 @@
 /* Virtual array support.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006
    Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
@@ -20,22 +20,11 @@
    the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-/* This file is compiled twice: once for the generator programs
-   once for the compiler.  */
-#ifdef GENERATOR_FILE
-#include "bconfig.h"
-#else
 #include "config.h"
-#endif
-
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#ifdef GENERATOR_FILE
-# include "errors.h"
-#else
-# include "toplev.h"
-#endif
+#include "toplev.h"
 #include "varray.h"
 #include "ggc.h"
 #include "hashtab.h"



More information about the Gcc-patches mailing list