diff options
| author | DJ Delorie <dj@redhat.com> | 2002-04-01 22:01:10 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-04-01 22:01:10 +0000 |
| commit | 3b71b99abdf0b735866dd5cd620fb8d9368e1aba (patch) | |
| tree | 88c94487ae6f288ca16417f07aab3b2127f81d9e | |
| parent | cb01b9eadb40425864240c92002c8428a3216455 (diff) | |
| download | newlib-3b71b99abdf0b735866dd5cd620fb8d9368e1aba.zip newlib-3b71b99abdf0b735866dd5cd620fb8d9368e1aba.tar.gz newlib-3b71b99abdf0b735866dd5cd620fb8d9368e1aba.tar.bz2 | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/dyn-string.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 6cc4b8e..1351058 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2002-04-01 Phil Edwards <pme@gcc.gnu.org> + + * dyn-string.h: Also allow IN_GLIBCPP_V3 to redefine names. + 2002-03-10 Daniel Jacobowitz <drow@mvista.com> * gdb: New directory. diff --git a/include/dyn-string.h b/include/dyn-string.h index 315f63f..2a771c7 100644 --- a/include/dyn-string.h +++ b/include/dyn-string.h @@ -1,5 +1,5 @@ /* An abstract string datatype. - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. Contributed by Mark Mitchell (mark@markmitchell.com). This file is part of GCC. @@ -45,7 +45,7 @@ typedef struct dyn_string names in user programs, the functions that are used in the demangler are given implementation-reserved names. */ -#ifdef IN_LIBGCC2 +#if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3) #define dyn_string_init __cxa_dyn_string_init #define dyn_string_new __cxa_dyn_string_new @@ -66,7 +66,7 @@ typedef struct dyn_string #define dyn_string_substring __cxa_dyn_string_substring #define dyn_string_eq __cxa_dyn_string_eq -#endif /* IN_LIBGCC2 */ +#endif /* IN_LIBGCC2 || IN_GLIBCPP_V3 */ extern int dyn_string_init PARAMS ((struct dyn_string *, int)); |