upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-16 00:58:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Forward declare mallocx in isc/mem.h

Browse source 
cmocka.h and jemalloc.h/malloc_np.h has conflicting macro definitions.
While fixing them with push_macro for only malloc is done below, we only
need the non-standard mallocx interface which is easy to just define by
ourselves.
This commit is contained in:
Aydın Mercan 2024-01-04 10:40:54 +03:00 committed by Ondřej Surý
parent 41a0ee1071
commit 197de93bdc
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/isc/include/isc/mem.h
View file

@ -190,14 +190,20 @@ extern unsigned int isc_mem_defaultflags;
* for more information.
*/
#if HAVE_JEMALLOC
#include <jemalloc/jemalloc.h>
/*
* cmocka.h has confliction definitions with the jemalloc header but we only
* need the mallocx symbol from jemalloc.
*/
void *
mallocx(size_t size, int flags);
extern volatile void *isc__mem_malloc;
#define isc_mem_create(cp) \
{ \
isc__mem_create((cp)_ISC_MEM_FILELINE); \
isc__mem_malloc = mallocx; \
#define isc_mem_create(cp) \
{ \
isc__mem_create((cp)_ISC_MEM_FILELINE); \
isc__mem_malloc = mallocx; \
ISC_INSIST(CMM_ACCESS_ONCE(isc__mem_malloc) != NULL); \
}
#else