diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-07-22 18:37:57 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-07-22 18:37:57 +0530 |
| commit | 55a4dd39308951da4b0da84b19e415c2bb451b60 (patch) | |
| tree | a0c690570b0bcbe7216e9936b06ea01c3b15fe5c /malloc/malloc.c | |
| parent | 57b07bede12635bd6d6aa0e488824bb510bbeca4 (diff) | |
| download | glibc-55a4dd39308951da4b0da84b19e415c2bb451b60.tar.gz glibc-55a4dd39308951da4b0da84b19e415c2bb451b60.tar.xz glibc-55a4dd39308951da4b0da84b19e415c2bb451b60.zip | |
Remove __morecore and __default_morecore
Make the __morecore and __default_morecore symbols compat-only and remove their declarations from the API. Also, include morecore.c directly into malloc.c; this should ideally get merged into malloc in a future cleanup. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 24e7854a0e..6e8fa9e424 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -384,12 +384,11 @@ __malloc_assert (const char *assertion, const char *file, unsigned int line, #define TRIM_FASTBINS 0 #endif - /* Definition for getting more memory from the OS. */ -#define MORECORE (*__morecore) +#include "morecore.c" + +#define MORECORE (*__glibc_morecore) #define MORECORE_FAILURE 0 -void * __default_morecore (ptrdiff_t); -void *(*__morecore)(ptrdiff_t) = __default_morecore; /* Memory tagging. */ |