From 6b357a9d2d6f6beb022e691de3031c1d5661aeba Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Thu, 13 Mar 2008 19:13:36 +0000
Subject: [PATCH] merge from gcc

---
 libiberty/ChangeLog   | 5 +++++
 libiberty/cplus-dem.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index baa4bdabe22..fad27c31414 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-12  Seongbae Park <seongbae.park@gmail.com>
+
+	* cplus-dem.c (malloc, realloc): Use void * instead of char *
+	as return type.
+
 2008-03-11  Nick Clifton  <nickc@redhat.com>
 
 	* md5.c (md5_process_bytes): Do not assume that memcpy will
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index da01a06c5fe..41674675366 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -52,8 +52,8 @@ Boston, MA 02110-1301, USA.  */
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #else
-char * malloc ();
-char * realloc ();
+void * malloc ();
+void * realloc ();
 #endif
 
 #include <demangle.h>
-- 
2.30.2