summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2008-03-13 19:13:36 +0000
committerDJ Delorie <dj@delorie.com>2008-03-13 19:13:36 +0000
commit82f76889a19f8a2e5a1dcd05682559947e869bbe (patch)
tree8b12391352f2655fa01418bf42d9f0d49f41354c
parent6f29c18d2f78e812b57a96120d94c5f350120438 (diff)
downloadbinutils-redhat-82f76889a19f8a2e5a1dcd05682559947e869bbe.tar.gz
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/cplus-dem.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index baa4bdabe2..fad27c3141 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 da01a06c5f..4167467536 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>