From 8730135a67d09670464c8f7d0347e4e221289505 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Sat, 3 May 2003 17:14:52 +0000
Subject: [PATCH] merge from gcc

---
 libiberty/ChangeLog     | 4 ++++
 libiberty/cp-demangle.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ae5a7c5499b..5beb09bb4fc 100644
--- 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 9adf5fd0503..5dcce5560ee 100644
--- 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;
-- 
2.30.2