From 78ec7601f546cedb044a76723af497f95b85bd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayd=C4=B1n=20Mercan?= Date: Fri, 3 Jan 2025 15:21:32 +0300 Subject: [PATCH] fixup! make feature probe macros consistent --- lib/isc/include/isc/mem.h | 6 +++--- lib/isc/jemalloc_shim.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h index 28bdd64041..767f6d942f 100644 --- a/lib/isc/include/isc/mem.h +++ b/lib/isc/include/isc/mem.h @@ -186,7 +186,7 @@ extern unsigned int isc_mem_defaultflags; * see https://github.com/jemalloc/jemalloc/issues/2566 * for more information. */ -#if HAVE_JEMALLOC +#ifdef HAVE_JEMALLOC /* * cmocka.h has confliction definitions with the jemalloc header but we only @@ -203,9 +203,9 @@ extern volatile void *isc__mem_malloc; isc__mem_malloc = mallocx; \ ISC_INSIST(CMM_ACCESS_ONCE(isc__mem_malloc) != NULL); \ } -#else +#else /* HAVE_JEMALLOC */ #define isc_mem_create(cp) isc__mem_create((cp)_ISC_MEM_FILELINE) -#endif +#endif /* HAVE_JEMALLOC */ void isc__mem_create(isc_mem_t **_ISC_MEM_FLARG); diff --git a/lib/isc/jemalloc_shim.h b/lib/isc/jemalloc_shim.h index 1f6ef0fc44..056bfc1db8 100644 --- a/lib/isc/jemalloc_shim.h +++ b/lib/isc/jemalloc_shim.h @@ -13,7 +13,7 @@ #pragma once -#if !defined(HAVE_JEMALLOC) +#ifndef HAVE_JEMALLOC #include #include @@ -81,4 +81,4 @@ rallocx(void *ptr, size_t size, int flags) { return ptr; } -#endif /* !defined(HAVE_JEMALLOC) */ +#endif /* !HAVE_JEMALLOC */