diff options
| author | Paul Eggert | 2016-09-17 15:06:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-09-17 15:06:55 -0700 |
| commit | 7fa96cb5ef8c8464496688e88c1b97211a820d79 (patch) | |
| tree | 814cf1e0895816541281b3fd5a6b29c52e9689ed /src/ralloc.c | |
| parent | 7cd3d85013896dc4160f70228fc198c65a42b2e2 (diff) | |
| download | emacs-7fa96cb5ef8c8464496688e88c1b97211a820d79.tar.gz emacs-7fa96cb5ef8c8464496688e88c1b97211a820d79.zip | |
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.
Diffstat (limited to 'src/ralloc.c')
| -rw-r--r-- | src/ralloc.c | 3 |
1 files changed, 2 insertions, 1 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; | |||
| 81 | 81 | ||
| 82 | #ifdef HAVE_MALLOC_H | 82 | #ifdef HAVE_MALLOC_H |
| 83 | # include <malloc.h> | 83 | # include <malloc.h> |
| 84 | #else | 84 | #endif |
| 85 | #ifndef DOUG_LEA_MALLOC | ||
| 85 | extern void *(*__morecore) (ptrdiff_t); | 86 | extern void *(*__morecore) (ptrdiff_t); |
| 86 | #endif | 87 | #endif |
| 87 | 88 | ||