merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index baa4bdabe222039ee4fbc44eefe7ac6eeb02e1ac..fad27c3141406ad3fccb6b68b2e31b23a8963448 100644 (file)
--- 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 da01a06c5fe96f284d4cf81e3cc1097d6dd4e6c3..416746753660e6bb4c909f91f503258a4ad0b7d4 100644 (file)
--- 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>