Use #if for rest of defines.

lib/crypto_backend/argon2/core.c

@@ -128,7 +128,7 @@ void secure_wipe_memory(void *v, size_t n) {
 void secure_wipe_memory(void *v, size_t n) {
     memset_s(v, n, 0, n);
 }
-#elif defined(HAVE_EXPLICIT_BZERO)
+#elif HAVE_EXPLICIT_BZERO
 void secure_wipe_memory(void *v, size_t n) {
     explicit_bzero(v, n);
 }

lib/crypto_backend/memutils.c

@@ -20,7 +20,7 @@
 ATTR_NOINLINE ATTR_ZERO_REGS
 void crypt_backend_memzero(void *s, size_t n)
 {
-#ifdef HAVE_EXPLICIT_BZERO
+#if HAVE_EXPLICIT_BZERO
 	explicit_bzero(s, n);
 #else
 	volatile uint8_t *p = (volatile uint8_t *)s;

lib/luks2/luks2_token.c

@@ -101,7 +101,7 @@ static void *token_dlvsym(struct crypt_device *cd,
 	char *error;
 	void *sym;
 
-#ifdef HAVE_DLVSYM
+#if HAVE_DLVSYM
 	log_dbg(cd, "Loading symbol %s@%s.", symbol, version);
 	sym = dlvsym(handle, symbol, version);
 #else

src/utils_tools.c

@@ -445,7 +445,7 @@ void tools_package_version(const char *name, bool use_pwlibs)
 #elif defined(ENABLE_PASSWDQC)
 	passwdqc = true;
 #endif
-#ifdef HAVE_HW_OPAL
+#if HAVE_HW_OPAL
 	hw_opal = true;
 #endif
 	log_std("%s %s flags: %s%s%s%s%s%s%s%s\n", name, PACKAGE_VERSION,

tests/all-symbols-test.c

@@ -57,7 +57,7 @@ static void test_logf(int level, const char *format, ...)
 
 static int check_dlvsym(void *h, const char *symbol, const char *version)
 {
-#ifdef HAVE_DLVSYM
+#if HAVE_DLVSYM
 	void *sym;
 	char *err;