aboutsummaryrefslogtreecommitdiff
path: root/libiberty/cp-demangle.h
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2004-06-28 18:01:46 +0000
committerDJ Delorie <dj@redhat.com>2004-06-28 18:01:46 +0000
commita21da8bff0e6a2efd2daa258e82574980c5cb270 (patch)
tree111065adc09e2cbfa7d2e33c8f05221fe1897556 /libiberty/cp-demangle.h
parent8ffc9dd4f476dc8a0a00e7fe8bca7b8ea68c66bb (diff)
downloadgdb-a21da8bff0e6a2efd2daa258e82574980c5cb270.zip
gdb-a21da8bff0e6a2efd2daa258e82574980c5cb270.tar.gz
gdb-a21da8bff0e6a2efd2daa258e82574980c5cb270.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty/cp-demangle.h')
-rw-r--r--libiberty/cp-demangle.h20
1 files changed, 16 insertions, 4 deletions
diff --git a/libiberty/cp-demangle.h b/libiberty/cp-demangle.h
index eea0868..02e74ec 100644
--- a/libiberty/cp-demangle.h
+++ b/libiberty/cp-demangle.h
@@ -131,19 +131,31 @@ struct d_info
/* Functions and arrays in cp-demangle.c which are referenced by
functions in cp-demint.c. */
+#ifdef IN_GLIBCPP_V3
+#define CP_STATIC_IF_GLIBCPP_V3 static
+#else
+#define CP_STATIC_IF_GLIBCPP_V3 extern
+#endif
-extern const struct demangle_operator_info cplus_demangle_operators[];
+CP_STATIC_IF_GLIBCPP_V3
+const struct demangle_operator_info cplus_demangle_operators[];
#define D_BUILTIN_TYPE_COUNT (26)
-extern const struct demangle_builtin_type_info
+CP_STATIC_IF_GLIBCPP_V3
+const struct demangle_builtin_type_info
cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT];
-extern struct demangle_component *
+CP_STATIC_IF_GLIBCPP_V3
+struct demangle_component *
cplus_demangle_mangled_name PARAMS ((struct d_info *, int));
-extern struct demangle_component *
+CP_STATIC_IF_GLIBCPP_V3
+struct demangle_component *
cplus_demangle_type PARAMS ((struct d_info *));
extern void
cplus_demangle_init_info PARAMS ((const char *, int, size_t, struct d_info *));
+
+/* cp-demangle.c needs to define this a little differently */
+#undef CP_STATIC_IF_GLIBCPP_V3