From 1c3b9698bc57acdbc5f2b62fbd3407b1798588f0 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 20 Aug 2025 19:38:00 +1000 Subject: [PATCH] Fix ISC_LEADING_ZEROS and ISC_TRAILING_ZEROS macros --- lib/isc/include/isc/bit.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/isc/include/isc/bit.h b/lib/isc/include/isc/bit.h index 78a72df3e9..59c11e47ec 100644 --- a/lib/isc/include/isc/bit.h +++ b/lib/isc/include/isc/bit.h @@ -48,23 +48,23 @@ #ifdef HAVE_BUILTIN_CLZG #define ISC_LEADING_ZEROS(x) __builtin_clzg(x, (int)(sizeof(x) * 8)) #else /* HAVE_BUILTIN_CLZG */ -#define ISC_LEADING_ZEROS(x) \ - ((x) == 0) ? (sizeof(x) * 8) \ - : _Generic((x), \ - unsigned int: __builtin_clz, \ - unsigned long: __builtin_clzl, \ - unsigned long long: __builtin_clzll)(x) +#define ISC_LEADING_ZEROS(x) \ + (((x) == 0) ? (sizeof(x) * 8) \ + : _Generic((x), \ + unsigned int: __builtin_clz, \ + unsigned long: __builtin_clzl, \ + unsigned long long: __builtin_clzll)(x)) #endif /* HAVE_BUILTIN_CLZG */ #ifdef HAVE_BUILTIN_CTZG #define ISC_TRAILING_ZEROS(x) __builtin_ctzg(x, (int)sizeof(x) * 8) #else /* HAVE_BUILTIN_CTZG */ -#define ISC_TRAILING_ZEROS(x) \ - ((x) == 0) ? (sizeof(x) * 8) \ - : _Generic((x), \ - unsigned int: __builtin_ctz, \ - unsigned long: __builtin_ctzl, \ - unsigned long long: __builtin_ctzll)(x) +#define ISC_TRAILING_ZEROS(x) \ + (((x) == 0) ? (sizeof(x) * 8) \ + : _Generic((x), \ + unsigned int: __builtin_ctz, \ + unsigned long: __builtin_ctzl, \ + unsigned long long: __builtin_ctzll)(x)) #endif /* HAVE_BUILTIN_CTZG */ #define ISC_LEADING_ONES(x) ISC_LEADING_ZEROS(~(x))