X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=libiberty%2Fxmalloc.c;h=3e97aab563f0e409a3d65a6258ee911e89101eb5;hb=51afcce0d32788512d303eb321b332492e8691d1;hp=adba5188df39b7e13a9e172107934a6b5de13999;hpb=979c05d32447bf9388479ed6ef8e5665b40e5763;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/xmalloc.c b/libiberty/xmalloc.c
index adba5188df..3e97aab563 100644
--- a/libiberty/xmalloc.c
+++ b/libiberty/xmalloc.c
@@ -75,11 +75,23 @@ function will be called to print an error message and terminate execution.
 #include <unixlib.h>
 #else
 /* For systems with larger pointers than ints, these must be declared.  */
-PTR malloc (size_t);
-PTR realloc (PTR, size_t);
-PTR calloc (size_t, size_t);
-PTR sbrk (ptrdiff_t);
-#endif
+#  if HAVE_STDLIB_H && HAVE_UNISTD_H && HAVE_DECL_MALLOC \
+      && HAVE_DECL_REALLOC && HAVE_DECL_CALLOC && HAVE_DECL_SBRK
+#    include <stdlib.h>
+#    include <unistd.h>
+#  else
+#    ifdef __cplusplus
+extern "C" {
+#    endif /* __cplusplus */
+void *malloc (size_t);
+void *realloc (void *, size_t);
+void *calloc (size_t, size_t);
+void *sbrk (ptrdiff_t);
+#    ifdef __cplusplus
+}
+#    endif /* __cplusplus */
+#  endif /* HAVE_STDLIB_H ...  */
+#endif /* VMS */
 
 /* The program name if set.  */
 static const char *name = "";