diff options
| author | DJ Delorie <dj@redhat.com> | 2007-01-30 23:16:58 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2007-01-30 23:16:58 +0000 |
| commit | 208c16740cef349dc64a72f3a8c4a93740154a9c (patch) | |
| tree | b37c70ca648a7391b58efe1026caa17f0bfa96fc /libiberty/cp-demangle.h | |
| parent | 71f2e6f41fd44507fade469e748fff19877acdd2 (diff) | |
merge from gcc
Diffstat (limited to 'libiberty/cp-demangle.h')
| -rw-r--r-- | libiberty/cp-demangle.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libiberty/cp-demangle.h b/libiberty/cp-demangle.h index 920ca47796..8622f29ca8 100644 --- a/libiberty/cp-demangle.h +++ b/libiberty/cp-demangle.h @@ -1,5 +1,5 @@ /* Internal demangler interface for g++ V3 ABI. - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. Written by Ian Lance Taylor <ian@wasabisystems.com>. This file is part of the libiberty library, which is part of GCC. @@ -143,8 +143,9 @@ struct d_info #define CP_STATIC_IF_GLIBCPP_V3 extern #endif -CP_STATIC_IF_GLIBCPP_V3 -const struct demangle_operator_info cplus_demangle_operators[]; +#ifndef IN_GLIBCPP_V3 +extern const struct demangle_operator_info cplus_demangle_operators[]; +#endif #define D_BUILTIN_TYPE_COUNT (26) |