Commit 4784e071 authored by Ralph Giles's avatar Ralph Giles
Browse files

Fix malloc_hook warning on glibc 2.17 and later.

In glib 2.17 the __malloc_ptr define was removed in favour
of using void* directly. Our declaration of mhook using this
type for the second argument therefore rightly generates a warning
on modern systems, since the type is assumed to be an int, which
is too narrow to hold a pointer on 64 bit architectures.

Since it was only ever a define we could use an #ifndef to define
__malloc_ptr ourselves. However we only use it once, so using void*
in the signature directly is cleaner. This should cause no problems
on older systems where it will match either the void* or the char*
(for non __STDC__ code) the define resolved to.
parent 2c7eb787
...@@ -1753,7 +1753,7 @@ int test_repacketizer_api(void) ...@@ -1753,7 +1753,7 @@ int test_repacketizer_api(void)
#endif #endif
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
typedef void *(*mhook)(size_t __size, __const __malloc_ptr_t); typedef void *(*mhook)(size_t __size, __const void *);
#endif #endif
int test_malloc_fail(void) int test_malloc_fail(void)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment