Port January __morecore changes to AIX 7.1

* src/vm-limit.c (__MALLOC_HOOK_VOLATILE, __morecore)
(__after_morecore_hook):
* src/ralloc.c (__morecore):
Declare if DOUG_LEA_MALLOC is not defined, not if HAVE_MALLOC_H is
not defined.  <malloc.h> does not declare these in AIX 7.1.

diff --git a/src/ralloc.c b/src/ralloc.c
index 071cee777e98db76ba2e2c12d8f918b68f9196a8..2faa42e829689ef2f8882b70d858a636b4fadacd 100644 (file)
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -81,7 +81,8 @@ static int extra_bytes;
 
 #ifdef HAVE_MALLOC_H
 # include <malloc.h>
-#else
+#endif
+#ifndef DOUG_LEA_MALLOC
 extern void *(*__morecore) (ptrdiff_t);
 #endif
 

diff --git a/src/vm-limit.c b/src/vm-limit.c
index 58e7729186c53d242c1f9c28dc5773b985051125..d53eecae3d3ea72a1640a5967e8793e4ef07275f 100644 (file)
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -54,7 +54,7 @@ char data_start[1] = { 1 };
 #ifdef HAVE_MALLOC_H
 # include <malloc.h>
 #endif
-#ifndef HAVE_MALLOC_H
+#ifndef DOUG_LEA_MALLOC
 # ifndef __MALLOC_HOOK_VOLATILE
 #  define __MALLOC_HOOK_VOLATILE volatile
 # endif