summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkorbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4>1999-04-29 15:38:02 +0000
committerkorbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4>1999-04-29 15:38:02 +0000
commited8eb9b3e0bb8d45a60428aa66f57110d0b8dc15 (patch)
tree00f1793c2295b13fcb38c991a263cd4f2083a3d3
parent1f397d75f339582171b2aa5ca43b9c56817eee95 (diff)
downloadgcc-ed8eb9b3e0bb8d45a60428aa66f57110d0b8dc15.tar.gz
new regex header name
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26697 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog1
-rw-r--r--gcc/Makefile.in4
-rw-r--r--gcc/fixinc/fixincl.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 396daa6fa36..12bdd0990f3 100644
--- 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 4e1d855e513..9d1ebddc66f 100644
--- 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 c8c54366aa3..bad82b86d8d 100644
--- 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";