diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-17 15:06:24 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-17 15:06:55 -0700 |
| commit | 7fa96cb5ef8c8464496688e88c1b97211a820d79 (patch) | |
| tree | 814cf1e0895816541281b3fd5a6b29c52e9689ed | |
| parent | 7cd3d85013896dc4160f70228fc198c65a42b2e2 (diff) | |
| download | emacs-7fa96cb5ef8c8464496688e88c1b97211a820d79.tar.gz | |
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.
| -rw-r--r-- | src/ralloc.c | 3 | ||||
| -rw-r--r-- | 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 <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 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 <malloc.h> #endif -#ifndef HAVE_MALLOC_H +#ifndef DOUG_LEA_MALLOC # ifndef __MALLOC_HOOK_VOLATILE # define __MALLOC_HOOK_VOLATILE volatile # endif |