Merge #88: build: Add -Wundef

sipa · sipa · commit fe6557642e9c · 2024-06-12T09:33:26.000-04:00
978a3d8 build: Add `-Wundef` (Hennadii Stepanov) Pull request description: This PR addresses bitcoin/bitcoin#29876 (comment): Steps to reproduce an issue: ``` $ g++ -Wundef -Wno-unused-parameter -o src/fields/libminisketch_a-generic_4bytes.o -c src/fields/generic_4bytes.cpp In file included from src/fields/generic_common_impl.h:12, from src/fields/generic_4bytes.cpp:12: src/fields/../int_utils.h:162:7: warning: "HAVE_CLZ" is not defined, evaluates to 0 [-Wundef] 162 | #elif HAVE_CLZ | ^~~~~~~~ ``` ACKs for top commit: sipa: utACK 978a3d8 theuni: utACK 978a3d8 Tree-SHA512: 75435649c5e2f9682643f83d1fed1260bcc83c617bc0f4476fbada18b8b48647681eda2e336d75be8a7fafe0dc47ef9987c9ceec917a3ee64cabce4b377f6917
diff --git a/configure.ac b/configure.ac
@@ -102,6 +102,7 @@ case $host in
 esac
 
 AX_CHECK_COMPILE_FLAG([-Wall],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wall"],,[[$CXXFLAG_WERROR]])
+AX_CHECK_COMPILE_FLAG([-Wundef], [WARN_CXXFLAGS="$WARN_CXXFLAGS -Wundef"], [], [$CXXFLAG_WERROR])
 AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],[CXXFLAGS="$CXXFLAGS -fvisibility=hidden"],[],[$CXXFLAG_WERROR])
 
 if test "x$use_ccache" != "xno"; then
diff --git a/src/int_utils.h b/src/int_utils.h
@@ -159,7 +159,7 @@ static inline int CountBits(I val, int max) {
     }
     if (!ret) return 0;
     return index + 1;
-#elif HAVE_CLZ
+#elif defined(HAVE_CLZ)
     (void)max;
     if (val == 0) return 0;
     if (std::numeric_limits<unsigned>::digits >= std::numeric_limits<I>::digits) {

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ static inline int CountBits(I val, int max) {`
`159`	`159`	`}`
`160`	`160`	`if (!ret) return 0;`
`161`	`161`	`return index + 1;`
`162`		`-#elif HAVE_CLZ`
	`162`	`+#elif defined(HAVE_CLZ)`
`163`	`163`	`(void)max;`
`164`	`164`	`if (val == 0) return 0;`
`165`	`165`	`if (std::numeric_limits<unsigned>::digits >= std::numeric_limits<I>::digits) {`