merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 2c5340051af32553e6c76075093bc661488184e1..39557fa3aa9a3721970af3d426fbc01b5a6b827c 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-02  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       * libiberty.h (XDELETE, XDELETEVEC, XRESIZEVEC): Remove any
+       const-qualification before disposal.
+
 2004-07-24  Bernardo Innocenti  <bernie@develer.com>
 
        * ansidecl.h (ARG_UNUSED): New Macro.

diff --git a/include/libiberty.h b/include/libiberty.h
index 68eeeae739699c75ab87d61a95b330c0a01d449c..a90b4ddcbe857084e05c15823c4b3cc998a34d76 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -261,14 +261,14 @@ extern double physmem_available PARAMS ((void));
 
 #define XNEW(T)                        ((T *) xmalloc (sizeof (T)))
 #define XCNEW(T)               ((T *) xcalloc (1, sizeof (T)))
-#define XDELETE(P)             free ((P))
+#define XDELETE(P)             free ((void*) (P))
 
 /* Array allocators.  */
 
 #define XNEWVEC(T, N)          ((T *) xmalloc (sizeof (T) * (N)))
 #define XCNEWVEC(T, N)         ((T *) xcalloc ((N), sizeof (T)))
-#define XRESIZEVEC(T, P, N)    ((T *) xrealloc ((P), sizeof (T) * (N)))
-#define XDELETEVEC(P)          free ((P))
+#define XRESIZEVEC(T, P, N)    ((T *) xrealloc ((void *) (P), sizeof (T) * (N)))
+#define XDELETEVEC(P)          free ((void*) (P))
 
 /* Allocators for variable-sized structures and raw buffers.  */