merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 47eca16..247cc8f 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-29  Neil Booth  <neil@daikokuya.co.uk>
+
+       * cplus-dem.c (PREPEND_BLANK): Remove.
+
 2002-07-10  Jason Merrill  <jason@redhat.com>
 
        * cp-demangle.c (demangle_identifier): Support extended Unicode

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 203e30d..995757c 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -305,8 +305,6 @@ const struct demangler_engine libiberty_demanglers[] =
 };
 
 #define STRING_EMPTY(str)      ((str) -> b == (str) -> p)
-#define PREPEND_BLANK(str)     {if (!STRING_EMPTY(str)) \
-    string_prepend(str, " ");}
 #define APPEND_BLANK(str)      {if (!STRING_EMPTY(str)) \
     string_append(str, " ");}
 #define LEN_STRING(str)         ( (STRING_EMPTY(str))?0:((str)->p - (str)->b))