summaryrefslogtreecommitdiff
path: root/libiberty
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
commit132c30ba8ad68b2179a2834600673f69a897b4f7 (patch)
tree0c50a3f112b33d010921782d7dbcc79419d52e0a /libiberty
parent789a85cfbc6b4b61bc91cea8792d855fc998b1dd (diff)
downloadgdb-132c30ba8ad68b2179a2834600673f69a897b4f7.tar.gz
merge from gcc
Diffstat (limited to 'libiberty')
-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 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>