merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3684ff74884c46dd5628ded5c8504f68e973bd95..6c6780732ef4a1f730ccbb9959cb94b465d2206a 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-11  Douglas B Rupp  <rupp@gnat.com>
+
+       * xatexit.c [VMS]: Include stdlib.h and unixlib.h.
+
 2002-03-06  Jim Blandy  <jimb@redhat.com>
 
        * splay-tree.c (splay_tree_xmalloc_allocate,

diff --git a/libiberty/xatexit.c b/libiberty/xatexit.c
index 728254b2c0d818bf54e6ae172ccf162d291716b8..abf340737e41e9b3fdd77516c1f25d56cc9e55d3 100644 (file)
--- a/libiberty/xatexit.c
+++ b/libiberty/xatexit.c
@@ -33,8 +33,13 @@ failure.  If you use @code{xatexit} to register functions, you must use
 #define size_t unsigned long
 #endif
 
+#if VMS
+#include <stdlib.h>
+#include <unixlib.h>
+#else
 /* For systems with larger pointers than ints, this must be declared.  */
 PTR malloc PARAMS ((size_t));
+#endif
 
 static void xatexit_cleanup PARAMS ((void));