From 7fa96cb5ef8c8464496688e88c1b97211a820d79 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 17 Sep 2016 15:06:24 -0700 Subject: [PATCH] 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. does not declare these in AIX 7.1. --- src/ralloc.c | 3 ++- src/vm-limit.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ralloc.c b/src/ralloc.c index 071cee777e9..2faa42e8296 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -81,7 +81,8 @@ static int extra_bytes; #ifdef HAVE_MALLOC_H # include -#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 58e7729186c..d53eecae3d3 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -54,7 +54,7 @@ char data_start[1] = { 1 }; #ifdef HAVE_MALLOC_H # include #endif -#ifndef HAVE_MALLOC_H +#ifndef DOUG_LEA_MALLOC # ifndef __MALLOC_HOOK_VOLATILE # define __MALLOC_HOOK_VOLATILE volatile # endif -- 2.39.5