diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fixinc/gnu-regex.c | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de88929..3c6f2df 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2000-11-08 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * fixinc/gnu-regex.c: Rename EGCS LOCAL markers to GCC LOCAL. + 2000-11-09 Joseph S. Myers <jsm28@cam.ac.uk> * calls.c (expand_call, emit_library_call_value_1), collect2.c @@ -79,8 +83,9 @@ Wed Nov 8 21:53:41 MET 2000 Jan Hubicka <jh@suse.cz> * expr.c (expand_expr) [ADDR_EXPR]: Handle when op0 is RETURN_DECL passed in multiple non-contiguous locations. +>>>>>>> 1.8198 2000-11-08 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> - + * README.gnat: Remove file. 2000-11-08 Alexandre Oliva <aoliva@redhat.com> diff --git a/gcc/fixinc/gnu-regex.c b/gcc/fixinc/gnu-regex.c index c152aba..eb12e03 100644 --- a/gcc/fixinc/gnu-regex.c +++ b/gcc/fixinc/gnu-regex.c @@ -62,7 +62,7 @@ #endif /* This is for other GNU distributions with internationalized messages. */ -/* EGCS LOCAL: ../intl will handle this for us */ +/* GCC LOCAL: ../intl will handle this for us */ #ifdef ENABLE_NLS # include <libintl.h> #else @@ -194,7 +194,7 @@ init_syntax_once () #endif /* not emacs */ /* Get the interface, including the syntax bits. */ -/* EGCS LOCAL: call it gnu-regex.h, not regex.h, to avoid name conflicts */ +/* GCC LOCAL: call it gnu-regex.h, not regex.h, to avoid name conflicts */ #include "gnu-regex.h" /* isalpha etc. are used for the character classes. */ @@ -2210,7 +2210,7 @@ regex_compile (pattern, size, syntax, bufp) the leading `:' and `[' (but set bits for them). */ if (c == ':' && *p == ']') { -/* EGCS LOCAL: Skip this code if we don't have btowc(). btowc() is */ +/* GCC LOCAL: Skip this code if we don't have btowc(). btowc() is */ /* defined in the 1994 Amendment 1 to ISO C and may not be present on */ /* systems where we have wchar.h and wctype.h. */ #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_BTOWC) |