diff options
| author | Andreas Schwab <schwab@suse.de> | 2019-07-09 16:44:02 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2019-07-10 15:04:05 +0200 |
| commit | 32b8188ac84ea0c0280a34f65c1fd7faf731c289 (patch) | |
| tree | 7fb8f6a8c8e76c074b996e770e473b8e4f7c1e81 | |
| parent | 7901d4ee7ba91c963a9a7c9365267552edad32f3 (diff) | |
| download | glibc-32b8188ac84ea0c0280a34f65c1fd7faf731c289.tar.gz glibc-32b8188ac84ea0c0280a34f65c1fd7faf731c289.tar.xz glibc-32b8188ac84ea0c0280a34f65c1fd7faf731c289.zip | |
Don't declare __malloc_check_init in <malloc.h> (bug 23352)
The function was never part of the malloc API.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | include/malloc.h | 2 | ||||
| -rw-r--r-- | malloc/malloc-internal.h | 3 | ||||
| -rw-r--r-- | malloc/malloc.h | 3 | ||||
| -rw-r--r-- | manual/memory.texi | 1 |
5 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 632e1804d8..d3c5e29639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,17 @@ +2019-07-10 Andreas Schwab <schwab@suse.de> + + [BZ #23352] + * malloc/malloc.h (__malloc_check_init): Don't declare. + * include/malloc.h (__malloc_check_init): Likewise. + * malloc/malloc-internal.h (__malloc_check_init): Declare it here. + * manual/memory.texi (__malloc_check_init): Don't mention it. + 2019-07-10 Mao Han <han_mao@c-sky.com> * locale/Makefile: Fix tst-locale-locpath arguments passing. 2019-07-09 Paul A. Clarke <pc@us.ibm.com> - + * sysdeps/powerpc/fpu/fenv_libc.h (_FPU_GET_RC): Protect use of __builtin_cpu_supports with __BUILTIN_CPU_SUPPORTS__. diff --git a/include/malloc.h b/include/malloc.h index d4cd9a5ffc..70d32c7c84 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -9,8 +9,6 @@ /* Nonzero if the malloc is already initialized. */ extern int __malloc_initialized attribute_hidden; -extern __typeof (__malloc_check_init) __malloc_check_init attribute_hidden; - struct malloc_state; typedef struct malloc_state *mstate; diff --git a/malloc/malloc-internal.h b/malloc/malloc-internal.h index 591ec4528a..54d90f901b 100644 --- a/malloc/malloc-internal.h +++ b/malloc/malloc-internal.h @@ -74,4 +74,7 @@ void __malloc_fork_unlock_child (void) attribute_hidden; /* Called as part of the thread shutdown sequence. */ void __malloc_arena_thread_freeres (void) attribute_hidden; +/* Activate a standard set of debugging hooks. */ +void __malloc_check_init (void) attribute_hidden; + #endif /* _MALLOC_INTERNAL_H */ diff --git a/malloc/malloc.h b/malloc/malloc.h index 523f1b1af5..70d8282bdc 100644 --- a/malloc/malloc.h +++ b/malloc/malloc.h @@ -159,9 +159,6 @@ extern void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t __alignment, __MALLOC_DEPRECATED; extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void); -/* Activate a standard set of debugging hooks. */ -extern void __malloc_check_init (void) __THROW __MALLOC_DEPRECATED; - __END_DECLS #endif /* malloc.h */ diff --git a/manual/memory.texi b/manual/memory.texi index a1435aad1a..b565dd69f2 100644 --- a/manual/memory.texi +++ b/manual/memory.texi @@ -1056,7 +1056,6 @@ systems that do not support @w{ISO C11}. @c next_env_entry ok @c strcspn dup ok @c __libc_mallopt dup @mtasuconst:mallopt [setting mp_] -@c __malloc_check_init @mtasuconst:malloc_hooks [setting hooks] @c *__malloc_initialize_hook unguarded, ok @c *__memalign_hook dup ok, unguarded @c arena_get dup @asulock @aculock @acsfd @acsmem |