Fix the remaining cases of #if vs #ifdef HAVE_XYZ

diff --git a/pdns/dnsdistdist/dnsdist-lua-actions.cc b/pdns/dnsdistdist/dnsdist-lua-actions.cc
index d728b28104da3ee3c673f377b6edbb981dc5b4d3..0112fd17c3426baddf04b0769a8901f5d8dd3dda 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-lua-actions.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-actions.cc
@@ -1708,7 +1708,7 @@ public:
       message.setServerIdentity(d_serverID);
     }
 
-#if HAVE_IPCIPHER
+#ifdef HAVE_IPCIPHER
     if (!d_ipEncryptKey.empty()) {
       message.setRequestor(encryptCA(dnsquestion->ids.origRemote, d_ipEncryptKey));
     }
@@ -1861,7 +1861,7 @@ public:
       message.setServerIdentity(d_serverID);
     }
 
-#if HAVE_IPCIPHER
+#ifdef HAVE_IPCIPHER
     if (!d_ipEncryptKey.empty()) {
       message.setRequestor(encryptCA(response->ids.origRemote, d_ipEncryptKey));
     }

diff --git a/pdns/dnsdistdist/dnsdist-nghttp2-in.cc b/pdns/dnsdistdist/dnsdist-nghttp2-in.cc
index 5fe0206a61efd7634083340209a78047ba258ec8..f3f622b152fca5f8c238744993f93389f91f6851 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-nghttp2-in.cc
+++ b/pdns/dnsdistdist/dnsdist-nghttp2-in.cc
@@ -947,7 +947,7 @@ int IncomingHTTP2Connection::on_header_callback(nghttp2_session* session, const
       return NGHTTP2_ERR_CALLBACK_FAILURE;
     }
 
-#if HAVE_NGHTTP2_CHECK_HEADER_VALUE_RFC9113
+#ifdef HAVE_NGHTTP2_CHECK_HEADER_VALUE_RFC9113
     if (nghttp2_check_header_value_rfc9113(value, valuelen) == 0) {
       vinfolog("Invalid header value");
       return NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -967,7 +967,7 @@ int IncomingHTTP2Connection::on_header_callback(nghttp2_session* session, const
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast): nghttp2 API
     auto valueView = std::string_view(reinterpret_cast<const char*>(value), valuelen);
     if (headerMatches(s_pathHeaderName)) {
-#if HAVE_NGHTTP2_CHECK_PATH
+#ifdef HAVE_NGHTTP2_CHECK_PATH
       if (nghttp2_check_path(value, valuelen) == 0) {
         vinfolog("Invalid path value");
         return NGHTTP2_ERR_CALLBACK_FAILURE;

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 69b59cec92ebb763b1f59c91223892c48d850271..d43b9d487b2266bb97274eadb5a7d9a1ab0baf5c 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -2968,7 +2968,7 @@ static pair<int, bool> doConfig(Logr::log_t startupLog, const string& configname
 
 static void handleRuntimeDefaults(Logr::log_t log)
 {
-#if HAVE_FIBER_SANITIZER
+#ifdef HAVE_FIBER_SANITIZER
   // Asan needs more stack
   if (::arg().asNum("stack-size") == 200000) { // the default in table.py
     ::arg().set("stack-size", "stack size per mthread") = "600000";