From 2f9c405836dd24090e3229c64b43e0f615f1048b Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 26 Dec 2003 16:27:37 +0000
Subject: merge from gcc

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

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 05a9b90..ada155d 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cp-demangle.c (is_ctor_or_dtor): Fix error in last change.
+
 2003-12-22  Daniel Jacobowitz  <drow@mvista.com>
 
 	PR debug/13272
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index b54cbe2..16871ab 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -4085,8 +4085,7 @@ is_ctor_or_dtor (mangled, ctor_kind, dtor_kind)
 	  free (di.comps);
 	if (di.subs != NULL)
 	  free (di.subs);
-	*palc = 1;
-	return NULL;
+	return 0;
       }
 #endif
 
-- 
cgit v1.1