From ee7283b3eece2cc92fe5ad1749ca4ba0e155285c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Fri, 26 Mar 2021 18:43:18 +0000
Subject: [PATCH] Merge branch 'bind-dyndb-ldap-v9.16.13' into 'main'

Do not require config.h to use isc/util.h

See merge request isc-projects/bind9!4840

(cherry picked from commit 19b69e9a3bdfea7d5128f1e37b27902268cf65b6)

81eb3396 Do not require config.h to use isc/util.h
---
 lib/isc/include/isc/util.h | 2 --
 lib/isc/lib.c              | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 2d99015034..64c26587ac 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -54,8 +54,6 @@
 #elif WIN32
 #define ISC_CONSTRUCTOR(priority)
 #define ISC_DESTRUCTOR(priority)
-#else
-#error Either __attribute__((constructor|destructor))__ or DllMain support needed to compile BIND 9.
 #endif
 
 /*%
diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index 27d7be10ea..08a1b913bc 100644
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -17,10 +17,15 @@
 #include <isc/tls.h>
 #include <isc/util.h>
 
+#include "config.h"
 #include "mem_p.h"
 #include "tls_p.h"
 #include "trampoline_p.h"
 
+#ifndef ISC_CONSTRUCTOR
+#error Either __attribute__((constructor|destructor))__ or DllMain support needed to compile BIND 9.
+#endif
+
 /***
  *** Functions
  ***/