--- lsb-build-c++-3.1.1/gcc-3.4.4/libiberty/cp-demangle.c.gcc4	2006-06-13 15:49:40.000000000 +0200
+++ lsb-build-c++-3.1.1/gcc-3.4.4/libiberty/cp-demangle.c	2006-06-13 15:43:45.000000000 +0200
@@ -1404,7 +1404,7 @@ d_identifier (di, len)
 
 #define NL(s) s, (sizeof s) - 1
 
-CP_STATIC_IF_GLIBCPP_V3
+//CP_STATIC_IF_GLIBCPP_V3
 const struct demangle_operator_info cplus_demangle_operators[] =
 {
   { "aN", NL ("&="),        2 },
@@ -1744,7 +1744,7 @@ d_ctor_dtor_name (di)
                   ::= u <source-name>
 */
 
-CP_STATIC_IF_GLIBCPP_V3
+//CP_STATIC_IF_GLIBCPP_V3
 const struct demangle_builtin_type_info
 cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT] =
 {