* fixinc/Makefile.in (FIXINC_DEFS): Add -DHAVE_CONFIG_H.

	* fixinc/gnu-regex.c: Don't include auto-host.h since we get
	config.h now.  Include libiberty.h to handle alloca.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bacb88d..ae6dbeb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-06  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * fixinc/Makefile.in (FIXINC_DEFS): Add -DHAVE_CONFIG_H.
+
+       * fixinc/gnu-regex.c: Don't include auto-host.h since we get
+       config.h now.  Include libiberty.h to handle alloca.
+
 2001-03-06  Zack Weinberg  <zackw@stanford.edu>
 
        * c-parse.in (yylexname): New function, split out of _yylex.

diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
index 88f615d..6557595 100644 (file)
--- a/gcc/fixinc/Makefile.in
+++ b/gcc/fixinc/Makefile.in
@@ -23,7 +23,7 @@
 # Its purpose is to build the any-platforms fixinc.sh script.
 
 FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS)
-FIXINC_DEFS = -DIN_GCC $(FL_LIST) $(INCLUDES)
+FIXINC_DEFS = -DIN_GCC -DHAVE_CONFIG_H $(FL_LIST) $(INCLUDES)
 
 # Directory where sources are, from where we are.
 srcdir = @srcdir@

diff --git a/gcc/fixinc/gnu-regex.c b/gcc/fixinc/gnu-regex.c
index a6ebd96..99786e2 100644 (file)
--- a/gcc/fixinc/gnu-regex.c
+++ b/gcc/fixinc/gnu-regex.c
@@ -22,10 +22,6 @@
    along with this program; if not, write to the Free Software Foundation, 
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "auto-host.h"
-/* GCC LOCAL: we don't need NLS here.  */
-#undef ENABLE_NLS
-
 #undef _GNU_SOURCE
 #define _GNU_SOURCE
 
@@ -33,6 +29,11 @@
 # include <config.h>
 #endif
 
+/* GCC LOCAL: we don't need NLS here.  */
+#undef ENABLE_NLS
+/* GCC LOCAL: to handle defining alloca.  */
+#include "libiberty.h"
+
 /* Do not use a C alloca, we will leak memory and crash.  */
 #ifdef C_ALLOCA
 # define REGEX_MALLOC