diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-07-13 09:58:37 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-07-13 09:58:37 +0200 |
| commit | e72b98e6f858583a3ef904e27c6fbd932bdc86c8 (patch) | |
| tree | ed93eaf93711b86e26627236e164b40ec72a757b /malloc | |
| parent | 48699da1c468543ade14777819bd1b4d652709de (diff) | |
| download | glibc-e72b98e6f858583a3ef904e27c6fbd932bdc86c8.tar.gz glibc-e72b98e6f858583a3ef904e27c6fbd932bdc86c8.tar.xz glibc-e72b98e6f858583a3ef904e27c6fbd932bdc86c8.zip | |
malloc: Deprecate more hook-related functionality
__morecore, __after_morecore_hook, and __default_morecore had not
been deprecated in commit 7d17596c198f11fa85cbcf9587443f262e63b616
("Mark malloc hook variables as deprecated"), probably by accident.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/malloc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/malloc/malloc.h b/malloc/malloc.h index a6903fdd54..e0e91a9331 100644 --- a/malloc/malloc.h +++ b/malloc/malloc.h @@ -75,11 +75,11 @@ extern void *pvalloc (size_t __size) __THROW __attribute_malloc__ __wur; /* Underlying allocation function; successive calls should return contiguous pieces of memory. */ -extern void *(*__morecore) (ptrdiff_t __size); +extern void *(*__morecore) (ptrdiff_t __size) __MALLOC_DEPRECATED; /* Default value of `__morecore'. */ extern void *__default_morecore (ptrdiff_t __size) -__THROW __attribute_malloc__; +__THROW __attribute_malloc__ __MALLOC_DEPRECATED; /* SVID2/XPG mallinfo structure */ @@ -156,7 +156,8 @@ extern void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t __alignment, size_t __size, const void *) __MALLOC_DEPRECATED; -extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void); +extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void) + __MALLOC_DEPRECATED; __END_DECLS |