From: Kaveh R. Ghazi Date: Wed, 7 Mar 2001 04:00:53 +0000 (+0000) Subject: Makefile.in (FIXINC_DEFS): Add -DHAVE_CONFIG_H. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed173cc96a054d113078d20a29f2a5cc3c269982;p=platform%2Fupstream%2Fgcc.git Makefile.in (FIXINC_DEFS): Add -DHAVE_CONFIG_H. * 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. From-SVN: r40283 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bacb88db..ae6dbeb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-03-06 Kaveh R. Ghazi + + * 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 * 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 --- 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 --- 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 #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