diff options
Diffstat (limited to 'vespamalloc/src/vespamalloc/malloc/overload.h')
| -rw-r--r-- | vespamalloc/src/vespamalloc/malloc/overload.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/vespamalloc/src/vespamalloc/malloc/overload.h b/vespamalloc/src/vespamalloc/malloc/overload.h index e209d1b6df5..abfe376b38b 100644 --- a/vespamalloc/src/vespamalloc/malloc/overload.h +++ b/vespamalloc/src/vespamalloc/malloc/overload.h @@ -15,10 +15,7 @@ public: vespamalloc::createAllocator(); } private: -#ifdef __clang__ - [[maybe_unused]] -#endif - unsigned _initialized; + [[maybe_unused]] unsigned _initialized; }; static CreateAllocator _CreateAllocator __attribute__ ((init_priority (543))); @@ -229,33 +226,22 @@ size_t malloc_usable_size (void * ptr) __THROW { } #define ALIAS(x) __attribute__ ((weak, alias (x), visibility ("default"))) -#ifdef __clang__ -void* __libc_malloc(size_t sz) __THROW __attribute__((malloc, alloc_size(1))) ALIAS("malloc"); -void* __libc_realloc(void* ptr, size_t sz) __THROW __attribute__((malloc, alloc_size(2))) ALIAS("realloc"); -void* __libc_reallocarray(void* ptr, size_t nemb, size_t sz) __THROW __attribute__((malloc, alloc_size(2,3))) ALIAS("reallocarray"); -void* __libc_calloc(size_t n, size_t sz) __THROW __attribute__((malloc, alloc_size(1,2))) ALIAS("calloc"); -void cfree(void *) __THROW ALIAS("free"); -void __libc_free(void* ptr) __THROW ALIAS("free"); -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wignored-attributes" -void __libc_cfree(void* ptr) __THROW ALIAS("cfree"); -#pragma clang diagnostic pop -#else + void* __libc_malloc(size_t sz) __THROW __attribute__((leaf, malloc, alloc_size(1))) ALIAS("malloc"); void* __libc_realloc(void* ptr, size_t sz) __THROW __attribute__((leaf, malloc, alloc_size(2))) ALIAS("realloc"); void* __libc_reallocarray(void* ptr, size_t nemb, size_t sz) __THROW __attribute__((leaf, malloc, alloc_size(2,3))) ALIAS("reallocarray"); void* __libc_calloc(size_t n, size_t sz) __THROW __attribute__((leaf, malloc, alloc_size(1,2))) ALIAS("calloc"); -void cfree(void *) __THROW __attribute__((leaf)) ALIAS("free"); void __libc_free(void* ptr) __THROW __attribute__((leaf)) ALIAS("free"); -void __libc_cfree(void* ptr) __THROW __attribute__((leaf)) ALIAS("cfree"); -#endif size_t __libc_malloc_usable_size(void *ptr) __THROW ALIAS("malloc_usable_size"); + #if __GLIBC_PREREQ(2, 34) void* __libc_memalign(size_t align, size_t s) __THROW __attribute__((leaf, malloc, alloc_align(1), alloc_size(2))) ALIAS("memalign"); #else void* __libc_memalign(size_t align, size_t s) __THROW __attribute__((leaf, malloc, alloc_size(2))) ALIAS("memalign"); #endif + int __posix_memalign(void** r, size_t a, size_t s) __THROW __nonnull((1)) ALIAS("posix_memalign"); + #if __GLIBC_PREREQ(2, 33) struct mallinfo2 __libc_mallinfo2() __THROW ALIAS("mallinfo2"); #else |