new regex header name

From-SVN: r26697

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 396daa6fa364b350e37bd24db9b30892867019fd..12bdd0990f327dfcac2d6c2fb9116d00994bcdeb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -5,6 +5,7 @@ Thu Apr 29 15:58:52 1999  Robert Lipe  <robertlipe@usa.net>
        * fixinc/gnu-regex.c, fixinc/gnu-regex.h: Imported from GDB 4.18.
        * fixinc/Makefile.in (OBJ, HDR): Handle name changes from above.
        (gnu-regex.o): Define REGEX_MALLOC to avoid memory leak.
+       * fixinc/fixincl.c: new regex.h header name 
 
 Thu Apr 29 12:53:33 1999  Richard Henderson  <rth@cygnus.com>
 

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4e1d855e513197ab259cc4d352fb982575cc0b6f..9d1ebddc66f623fb562d4f37cdebe36bc89f6c73 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2120,8 +2120,8 @@ stmp-headers:
 
 FIXINCSRCDIR=$(srcdir)/fixinc
 fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
-       $(FIXINCSRCDIR)/procopen.c $(FIXINCSRCDIR)/regex.c \
-       $(FIXINCSRCDIR)/server.c $(FIXINCSRCDIR)/regex.h \
+       $(FIXINCSRCDIR)/procopen.c $(FIXINCSRCDIR)/gnu-regex.c \
+       $(FIXINCSRCDIR)/server.c $(FIXINCSRCDIR)/gnu-regex.h \
        $(FIXINCSRCDIR)/server.h $(FIXINCSRCDIR)/inclhack.def 
        MAKE="$(MAKE)"; srcdir=`cd $(srcdir)/fixinc; pwd` ; \
        export MAKE srcdir ; \

diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index c8c54366aa34229bdac189cebf59384a00c26e41..bad82b86d8db4fab49e231cdf84245887c0eabde 100644 (file)
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -51,7 +51,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #include <ctype.h>
 
-#include "regex.h"
+#include "gnu-regex.h"
 #include "server.h"
 
 static const char program_id[] = "fixincl version 1.0";