aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPhil Edwards <pme@gcc.gnu.org>2002-04-01 21:54:28 +0000
committerPhil Edwards <pme@gcc.gnu.org>2002-04-01 21:54:28 +0000
commit7bf421c16301f02682bb73fe7d726d2572da2042 (patch)
tree2db9cf702a0c47261d7eba18bfc1285106c9f77e /include
parentdffd7eb68ad26f910304f7f68fd2b25bbae71ae8 (diff)
downloadgcc-7bf421c16301f02682bb73fe7d726d2572da2042.zip
gcc-7bf421c16301f02682bb73fe7d726d2572da2042.tar.gz
gcc-7bf421c16301f02682bb73fe7d726d2572da2042.tar.bz2
dyn-string.h: Also allow IN_GLIBCPP_V3 to redefine names.
2002-04-01 Phil Edwards <pme@gcc.gnu.org> * dyn-string.h: Also allow IN_GLIBCPP_V3 to redefine names. From-SVN: r51707
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog4
-rw-r--r--include/dyn-string.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index f35f7ad..01e3d44 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-06 Andrew Cagney <ac131313@redhat.com>
* floatformat.h (floatformat_arm_ext): Delete declaration.
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));