From 2a26ef3a012cc29623423ca52c1cc8001d847d54 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Thu, 17 Jan 2013 21:08:12 +0100 Subject: Add HAVE_MREMAP for mremap usage Introduce (only on Linux) and use a HAVE_MREMAP symbol to advertize mremap availability. Move the malloc-sysdep.h include from arena.c to malloc.c, since what is provided by malloc-sysdep.h is needed earlier in malloc.c, before the inclusion of arena.c. --- malloc/arena.c | 3 --- malloc/malloc.c | 12 ++++-------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'malloc') diff --git a/malloc/arena.c b/malloc/arena.c index 0c7780282b..7d51a9dd14 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -19,9 +19,6 @@ #include -/* Get the implementation for check_may_shrink_heap. */ -#include - /* Compile-time constants. */ #define HEAP_MIN_SIZE (32*1024) diff --git a/malloc/malloc.c b/malloc/malloc.c index 9188d4e49e..bbb035393f 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -168,7 +168,7 @@ Compilation Environment options: - HAVE_MREMAP 0 unless linux defined + HAVE_MREMAP 0 Changing default word sizes: @@ -214,8 +214,10 @@ #include /* for size_t */ #include /* for getenv(), abort() */ +#include /* for __libc_enable_secure */ #include +#include #include #include <_itoa.h> @@ -490,19 +492,13 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore; /* Define HAVE_MREMAP to make realloc() use mremap() to re-allocate - large blocks. This is currently only possible on Linux with - kernel versions newer than 1.3.77. + large blocks. */ #ifndef HAVE_MREMAP -#ifdef linux -#define HAVE_MREMAP 1 -#else #define HAVE_MREMAP 0 #endif -#endif /* HAVE_MREMAP */ - /* This version of malloc supports the standard SVID/XPG mallinfo -- cgit v1.2.3