merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ae5a7c5499be819e7c7d53df2fb70976788d79a8..5beb09bb4fcfeee91de94ceee05285188669a760 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-03  Carlo Wood  <carlo@alinoe.com>
+
+       * cp-demangle.c: Fix typo in "char_traints" string-literal.
+
 2003-04-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * vsnprintf.c (vsnprintf): Don't pad string with extra nulls.

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 9adf5fd05031df5579405cfb4d8ec9bae7a1906e..5dcce5560ee135525808f962ae7bec5d1f2d11d9 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -3398,7 +3398,7 @@ demangle_substitution (dm, template_p)
            }
          else
            {
-             RETURN_IF_ERROR (result_add (dm, "std::basic_istream<char, std::char_traints<char> >"));
+             RETURN_IF_ERROR (result_add (dm, "std::basic_istream<char, std::char_traits<char> >"));
              new_last_source_name = "basic_istream";
            }
          *template_p = 0;