Fix test warnings regarding boost dynamic linking define

Meson passes BOOST_TEST_DYN_LINK through the command line so there's no need to re-define
it in each test file. Otherwise the compiler warns about the redefinition.

warning: "BOOST_TEST_DYN_LINK" redefined
    1 | #define BOOST_TEST_DYN_LINK
      |
<command-line>: note: this is the location of the previous definition

diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc
index d7b967009a5a53cb551993a3bb54a7aad9abc9e0..7d7646ed13826d2b69cb342438526577cc31b70f 100644 (file)
--- a/modules/remotebackend/test-remotebackend-http.cc
+++ b/modules/remotebackend/test-remotebackend-http.cc
@@ -55,7 +55,10 @@ public:
 
 std::unique_ptr<DNSBackend> backendUnderTest;
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 

diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc
index 7291d45e459e2ec500eb43f8d392a65656808fe9..ec85e16852d32a7874d365ea99edffd3dc07b381 100644 (file)
--- a/modules/remotebackend/test-remotebackend-json.cc
+++ b/modules/remotebackend/test-remotebackend-json.cc
@@ -53,7 +53,10 @@ public:
 
 std::unique_ptr<DNSBackend> backendUnderTest;
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 

diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc
index c643533d461e474185e7d1ee27aaf99b4eb57ded..6165adb2c022c4a99b93db397c7d2aa175298d7d 100644 (file)
--- a/modules/remotebackend/test-remotebackend-pipe.cc
+++ b/modules/remotebackend/test-remotebackend-pipe.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 

diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc
index fcae528e377735d32910c4ade56959e9143301de..47107149e057897da169eb18a0a9f5356e3da26f 100644 (file)
--- a/modules/remotebackend/test-remotebackend-post.cc
+++ b/modules/remotebackend/test-remotebackend-post.cc
@@ -53,7 +53,10 @@ public:
 
 std::unique_ptr<DNSBackend> backendUnderTest;
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 

diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc
index 5c16564e3e440e92035ce212eba3b7c212cb14d9..09651e757948702b21a3c48521ab41ca6722bf87 100644 (file)
--- a/modules/remotebackend/test-remotebackend-unix.cc
+++ b/modules/remotebackend/test-remotebackend-unix.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 

diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc
index e7f65cda1d0de8aaab5a97fe3e301cf8fc6a64a5..a0e7e00d185fe686237b06d63cad24963934c714 100644 (file)
--- a/modules/remotebackend/test-remotebackend-zeromq.cc
+++ b/modules/remotebackend/test-remotebackend-zeromq.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 

diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc
index 566390aa915d21b5a391b6511ae584286c3f06b2..ebbb636cc8af5c3da509ceeafd9b7e1548246b59 100644 (file)
--- a/modules/remotebackend/test-remotebackend.cc
+++ b/modules/remotebackend/test-remotebackend.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/dnsdistdist/test-connectionmanagement_hh.cc b/pdns/dnsdistdist/test-connectionmanagement_hh.cc
index 83205183c329dbfeb4adc37d83eb52b6333a9762..7ebaf3114e967147f1d6403e737789dd0b8c6817 100644 (file)
--- a/pdns/dnsdistdist/test-connectionmanagement_hh.cc
+++ b/pdns/dnsdistdist/test-connectionmanagement_hh.cc
@@ -1,5 +1,7 @@
-
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-delaypipe_hh.cc b/pdns/dnsdistdist/test-delaypipe_hh.cc
index 41040a906f3334d5ff3cd71128395a6768da6bb9..4bc0b02af9368066fbd7aa8af01f45ff3599cdd4 100644 (file)
--- a/pdns/dnsdistdist/test-delaypipe_hh.cc
+++ b/pdns/dnsdistdist/test-delaypipe_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/dnsdistdist/test-dnsdist-connections-cache.cc b/pdns/dnsdistdist/test-dnsdist-connections-cache.cc
index 024d9db9405909e53a41f6b1a3c6fcb8c80fbe2e..b6f86b6525ee0a210f403ec913ccbca3b0ac0589 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdist-connections-cache.cc
+++ b/pdns/dnsdistdist/test-dnsdist-connections-cache.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdist-dnsparser.cc b/pdns/dnsdistdist/test-dnsdist-dnsparser.cc
index 52f8076c30f459ae99412034c3fc5c7a488b4fd5..a7bb4e37b39a48a94c3fbbc45434ef4c279f5bd1 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdist-dnsparser.cc
+++ b/pdns/dnsdistdist/test-dnsdist-dnsparser.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdist-lua-ffi.cc b/pdns/dnsdistdist/test-dnsdist-lua-ffi.cc
index 72b3d383087e60cd2bb038f3394033eca72667f4..b67d91920c032f1c6609667f40b98a5c68f0c1ec 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdist-lua-ffi.cc
+++ b/pdns/dnsdistdist/test-dnsdist-lua-ffi.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistasync.cc b/pdns/dnsdistdist/test-dnsdistasync.cc
index 044d5a02f30fb87153b13c64aa10e02fe875b108..e535ba3cb4d6268f9c3f88e79dff961a3451208b 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistasync.cc
+++ b/pdns/dnsdistdist/test-dnsdistasync.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistbackend_cc.cc b/pdns/dnsdistdist/test-dnsdistbackend_cc.cc
index 983f91289ae70b720cc025bac59b01466763cd41..34745f4228be0cede626dff8fb128377663a6e5c 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistbackend_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistbackend_cc.cc
@@ -1,5 +1,8 @@
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc b/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc
index 46f9916b715b875c9d5cc850384df5affcbdeb6e..fbb7f38ec1c9976df3dc524b496c26ec868f95d2 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc
+++ b/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc
@@ -1,5 +1,8 @@
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistedns.cc b/pdns/dnsdistdist/test-dnsdistedns.cc
index 93e0e0080bca12257fe4458a032f3bebcafbc7d2..603bc3eca6944d85130ed6af34f231270bddd677 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistedns.cc
+++ b/pdns/dnsdistdist/test-dnsdistedns.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistkvs_cc.cc b/pdns/dnsdistdist/test-dnsdistkvs_cc.cc
index 8c5d756d1b8fd1390eb41816450c00e35112f1d6..7177d67f4f3ec7de5f0cc2d9b77d1feb4df6bcf2 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistkvs_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistkvs_cc.cc
@@ -1,5 +1,8 @@
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistlbpolicies_cc.cc b/pdns/dnsdistdist/test-dnsdistlbpolicies_cc.cc
index 9d437578f77fb48fe8e71844841e38ddbf141e27..94594bd17bf0cc1c38a8f153fb4cd51a857fee50 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistlbpolicies_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistlbpolicies_cc.cc
@@ -1,5 +1,8 @@
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistluanetwork.cc b/pdns/dnsdistdist/test-dnsdistluanetwork.cc
index 125541857672421cbb78d0072437f69db26946a3..6ddc4a2005876c9e272e8531b9bf9f553dc2ae01 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistluanetwork.cc
+++ b/pdns/dnsdistdist/test-dnsdistluanetwork.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc b/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc
index 27364fa3708bf38e0e967ba484fb2e98db52fc78..49a891d8560a5648707c46c1b3b2ea03a35ce9f1 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc b/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc
index 2d86c970061491ba696c62478039384743520350..50222414a22b59eb42fcc8a6d040003cf3cd2c12 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdistrings_cc.cc b/pdns/dnsdistdist/test-dnsdistrings_cc.cc
index a642a951b5471410c68b544dd7e086f1a2f4ea04..77450c8b051d7a30dcf452e03d886bb4d8e9baeb 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistrings_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistrings_cc.cc
@@ -1,5 +1,8 @@
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <thread>

diff --git a/pdns/dnsdistdist/test-dnsdistrules_cc.cc b/pdns/dnsdistdist/test-dnsdistrules_cc.cc
index b636ea922fb381fdd3ddde98599846dea4de2194..b709bd48168a76e7bf1d765bcac2ff6fd20fa9c0 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistrules_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistrules_cc.cc
@@ -1,5 +1,8 @@
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <thread>

diff --git a/pdns/dnsdistdist/test-dnsdistsvc_cc.cc b/pdns/dnsdistdist/test-dnsdistsvc_cc.cc
index a7cad91b751a7949ec8b932b1da6c841a12d362b..6350f3ae5c29146680814e16147c0515918b5a1d 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistsvc_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistsvc_cc.cc
@@ -1,5 +1,8 @@
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc
index 14a13cde8a2ef9d51de63c2750e3de834743e07b..eacadf0401a2bb5ce965235a03306baa398ef52c 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/dnsdistdist/testrunner.cc b/pdns/dnsdistdist/testrunner.cc
index b6a685288678178690367322c76c72989dab8ebd..66b82aaf6963bf8065a499a62d15279a41671b88 100644 (file)
--- a/pdns/dnsdistdist/testrunner.cc
+++ b/pdns/dnsdistdist/testrunner.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 

diff --git a/pdns/recursordist/test-aggressive_nsec_cc.cc b/pdns/recursordist/test-aggressive_nsec_cc.cc
index 249e9b561f74a6fbb5d706558216ce2d783d3f5d..74e6706ecda940babf90f6d70ac77e15b1c2f8b9 100644 (file)
--- a/pdns/recursordist/test-aggressive_nsec_cc.cc
+++ b/pdns/recursordist/test-aggressive_nsec_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "aggressive_nsec.hh"

diff --git a/pdns/recursordist/test-ednsoptions_cc.cc b/pdns/recursordist/test-ednsoptions_cc.cc
index 5878022cb00924b6f471a5707ef3f863df6af7ff..7c99d5af7b32204e4870b7eb6425c673acf08383 100644 (file)
--- a/pdns/recursordist/test-ednsoptions_cc.cc
+++ b/pdns/recursordist/test-ednsoptions_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/recursordist/test-filterpo_cc.cc b/pdns/recursordist/test-filterpo_cc.cc
index dec12ad460e7374cedd88d13b475053530b63bba..f91abdf07570c89d73be16d58235540ee3572da6 100644 (file)
--- a/pdns/recursordist/test-filterpo_cc.cc
+++ b/pdns/recursordist/test-filterpo_cc.cc
@@ -1,5 +1,8 @@
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/recursordist/test-histogram_hh.cc b/pdns/recursordist/test-histogram_hh.cc
index b336df55d55d1e78346dc73654f2f4b23cd4fd4d..a88013adf5bca46bcd75764cb79b58a431f2e4dc 100644 (file)
--- a/pdns/recursordist/test-histogram_hh.cc
+++ b/pdns/recursordist/test-histogram_hh.cc
@@ -20,7 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/recursordist/test-mtasker.cc b/pdns/recursordist/test-mtasker.cc
index 18a9620c7df921ddb845a69acc3fa32beb49ed15..54053024ba77c595b23069889df2d5b53f5c249b 100644 (file)
--- a/pdns/recursordist/test-mtasker.cc
+++ b/pdns/recursordist/test-mtasker.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/recursordist/test-negcache_cc.cc b/pdns/recursordist/test-negcache_cc.cc
index dc01f55585a4670e34f2fe55ac003182d3af5591..f6ce64c4a60b32f3a2eddade9e03552ebf879620 100644 (file)
--- a/pdns/recursordist/test-negcache_cc.cc
+++ b/pdns/recursordist/test-negcache_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
 

diff --git a/pdns/recursordist/test-nod_cc.cc b/pdns/recursordist/test-nod_cc.cc
index d764570419401972eff1eb0918edd711fd3950d9..d7700f7d2455b4a2acdb3404c8b8b3ffca8f2f8c 100644 (file)
--- a/pdns/recursordist/test-nod_cc.cc
+++ b/pdns/recursordist/test-nod_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
 #include "nod.hh"

diff --git a/pdns/recursordist/test-rec-taskqueue.cc b/pdns/recursordist/test-rec-taskqueue.cc
index b025a40fe346ea9af28d2ceba80a17eb80bcbb94..00f2bd0b47aa2ce128d022ee2b8e5578f56ba3a1 100644 (file)
--- a/pdns/recursordist/test-rec-taskqueue.cc
+++ b/pdns/recursordist/test-rec-taskqueue.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include <stdio.h>

diff --git a/pdns/recursordist/test-rec-tcounters_cc.cc b/pdns/recursordist/test-rec-tcounters_cc.cc
index bdeede0699b1c8d773fe28fba126aee141327895..82faf5343096c271becb2927d583babe1280c57d 100644 (file)
--- a/pdns/recursordist/test-rec-tcounters_cc.cc
+++ b/pdns/recursordist/test-rec-tcounters_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/recursordist/test-rec-zonetocache.cc b/pdns/recursordist/test-rec-zonetocache.cc
index 12c0a6dc9aa63a971ddbf0461178e2bf67b40f7b..48bc20c7f2c1db57e9c2c6749ba5a3e91f020582 100644 (file)
--- a/pdns/recursordist/test-rec-zonetocache.cc
+++ b/pdns/recursordist/test-rec-zonetocache.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include <stdio.h>

diff --git a/pdns/recursordist/test-recpacketcache_cc.cc b/pdns/recursordist/test-recpacketcache_cc.cc
index 353407ea276f7bacb4c658fe7cb874084beb0f5b..df74d9a7430d59abfbfe8195fecbdeb03470d9aa 100644 (file)
--- a/pdns/recursordist/test-recpacketcache_cc.cc
+++ b/pdns/recursordist/test-recpacketcache_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/recursordist/test-recursorcache_cc.cc b/pdns/recursordist/test-recursorcache_cc.cc
index 71a05440eecb8b55da4fc2ae1341d07c0da7995d..27b6e907386ac8bd5dc06520ca2efb0ba7c7127e 100644 (file)
--- a/pdns/recursordist/test-recursorcache_cc.cc
+++ b/pdns/recursordist/test-recursorcache_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/recursordist/test-reczones-helpers.cc b/pdns/recursordist/test-reczones-helpers.cc
index 8693625a985b7886bdc66c4495779736432e4fe7..a010c13fea317f0d0758bbafe7d304f8f3dc2274 100644 (file)
--- a/pdns/recursordist/test-reczones-helpers.cc
+++ b/pdns/recursordist/test-reczones-helpers.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include <cstdio>

diff --git a/pdns/recursordist/test-secpoll_cc.cc b/pdns/recursordist/test-secpoll_cc.cc
index 07660b08a8ced870f15673e404e3df4c3a2cf702..f3b9f2582043367d5f820c753435eb8212cc3102 100644 (file)
--- a/pdns/recursordist/test-secpoll_cc.cc
+++ b/pdns/recursordist/test-secpoll_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/recursordist/test-settings.cc b/pdns/recursordist/test-settings.cc
index 779684e4d2562d9d0cbc919b0b262f053ba95063..f94dbf6c1dc05050e51b94cb7dbb3e1d3fe7ddb2 100644 (file)
--- a/pdns/recursordist/test-settings.cc
+++ b/pdns/recursordist/test-settings.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include <memory>

diff --git a/pdns/recursordist/test-syncres_cc.cc b/pdns/recursordist/test-syncres_cc.cc
index 50e45a80f2e6e714ecc0c372779d1d3bd6a2f9ae..1fd0a87d838c0c31773079a7637eb800e7996869 100644 (file)
--- a/pdns/recursordist/test-syncres_cc.cc
+++ b/pdns/recursordist/test-syncres_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "aggressive_nsec.hh"

diff --git a/pdns/recursordist/test-syncres_cc1.cc b/pdns/recursordist/test-syncres_cc1.cc
index 3676524d3c09bb54672e2d92f21528b0ac4a1230..372f07873fb5737db4871c9f6f68371e7e6834a6 100644 (file)
--- a/pdns/recursordist/test-syncres_cc1.cc
+++ b/pdns/recursordist/test-syncres_cc1.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/test-syncres_cc10.cc b/pdns/recursordist/test-syncres_cc10.cc
index cefe3fd49ddb063cc5a6fd2d458d80a115b02aff..d43570f0e6b567f5d52730c45c4f40d745bf3b18 100644 (file)
--- a/pdns/recursordist/test-syncres_cc10.cc
+++ b/pdns/recursordist/test-syncres_cc10.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/test-syncres_cc2.cc b/pdns/recursordist/test-syncres_cc2.cc
index 7f761238f03c37e178a9f269b1891acfe0f2e5cc..d2790a9f4f5713b34b32397700fac417a38fcc05 100644 (file)
--- a/pdns/recursordist/test-syncres_cc2.cc
+++ b/pdns/recursordist/test-syncres_cc2.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/test-syncres_cc3.cc b/pdns/recursordist/test-syncres_cc3.cc
index 7acdb4f4ca65ec4e7bf374774a7b13e85d8b77d9..431f5cc5a00502a77b6e37ef71f56121e34b9b66 100644 (file)
--- a/pdns/recursordist/test-syncres_cc3.cc
+++ b/pdns/recursordist/test-syncres_cc3.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/test-syncres_cc4.cc b/pdns/recursordist/test-syncres_cc4.cc
index 3e02e501bc1287831880eba91167c8229d7aad87..42818c3da00deda31d942ba5103897e807e6ac1a 100644 (file)
--- a/pdns/recursordist/test-syncres_cc4.cc
+++ b/pdns/recursordist/test-syncres_cc4.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/test-syncres_cc5.cc b/pdns/recursordist/test-syncres_cc5.cc
index 367a68a6cee1db450b1d9caefda15e84f9d35621..7f53697290626464ec367e78895a0dd616554319 100644 (file)
--- a/pdns/recursordist/test-syncres_cc5.cc
+++ b/pdns/recursordist/test-syncres_cc5.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/test-syncres_cc6.cc b/pdns/recursordist/test-syncres_cc6.cc
index bae815c34d170ef69d809c9de906426deb29dca8..44297eadd8b593ff87dce4678933e700aaef6da6 100644 (file)
--- a/pdns/recursordist/test-syncres_cc6.cc
+++ b/pdns/recursordist/test-syncres_cc6.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/test-syncres_cc7.cc b/pdns/recursordist/test-syncres_cc7.cc
index df5fb0850aacd0b025bc8a30889cdaf9e6cdb417..6a64a52028b756d5f34f21286ed262f532e6d364 100644 (file)
--- a/pdns/recursordist/test-syncres_cc7.cc
+++ b/pdns/recursordist/test-syncres_cc7.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/test-syncres_cc8.cc b/pdns/recursordist/test-syncres_cc8.cc
index 2026f607fb71dea6e4acbfa4cda4c33f363cdeca..a557ee48a20abaa4e97e4dd3cf3889d782259dd1 100644 (file)
--- a/pdns/recursordist/test-syncres_cc8.cc
+++ b/pdns/recursordist/test-syncres_cc8.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/test-syncres_cc9.cc b/pdns/recursordist/test-syncres_cc9.cc
index 5a2dfab2c52581333b86c920e99c2b4dbfffe7bf..f4c8c04ff0747e7c7b811fc9b95c50525adb2e09 100644 (file)
--- a/pdns/recursordist/test-syncres_cc9.cc
+++ b/pdns/recursordist/test-syncres_cc9.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #include <boost/test/unit_test.hpp>
 
 #include "test-syncres_cc.hh"

diff --git a/pdns/recursordist/testrunner.cc b/pdns/recursordist/testrunner.cc
index fb4b0ec396c54898e97f65666adccdb575c78055..125cacd8314ee544e9045fe64063a6efec61d538 100644 (file)
--- a/pdns/recursordist/testrunner.cc
+++ b/pdns/recursordist/testrunner.cc
@@ -19,7 +19,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-arguments_cc.cc b/pdns/test-arguments_cc.cc
index 2e31cfb2cfc9b8db4757146fa3a72f3d1d113d95..73dbbc4ef89347c8ccef2209bfe5e8ff3f339652 100644 (file)
--- a/pdns/test-arguments_cc.cc
+++ b/pdns/test-arguments_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-auth-zonecache_cc.cc b/pdns/test-auth-zonecache_cc.cc
index de183ab4259b1ca77e6509cd1286b99cfa565a97..692a4917501675778f126dd41635627377d87035 100644 (file)
--- a/pdns/test-auth-zonecache_cc.cc
+++ b/pdns/test-auth-zonecache_cc.cc
@@ -1,4 +1,3 @@
-
 /*
     PowerDNS Versatile Database Driven Nameserver
     Copyright (C) 2021  PowerDNS.COM BV
@@ -21,7 +20,10 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-base32_cc.cc b/pdns/test-base32_cc.cc
index 1680bc460391c8016dc56c76e35e27aa4c3c4c79..40c3bdedb4dabffa937806478163bab077c6dd19 100644 (file)
--- a/pdns/test-base32_cc.cc
+++ b/pdns/test-base32_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-base64_cc.cc b/pdns/test-base64_cc.cc
index 2f694b1b120cdb35312eb1ab9635d5071d2602dd..d246b0d18e97f6719071bd7e7437c47583ba7480 100644 (file)
--- a/pdns/test-base64_cc.cc
+++ b/pdns/test-base64_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-bindparser_cc.cc b/pdns/test-bindparser_cc.cc
index 9a918b36c7d5d1958f8aa343f9f4b01debf6fc71..ff37fcf117df7ec241e2a958e319bcc62fb31e39 100644 (file)
--- a/pdns/test-bindparser_cc.cc
+++ b/pdns/test-bindparser_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-channel.cc b/pdns/test-channel.cc
index 8bd042122e04c86fd1d1660d3126b82af4e527a3..75c5a598f27b475d6fa91a3877eadf520e54e650 100644 (file)
--- a/pdns/test-channel.cc
+++ b/pdns/test-channel.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/test-communicator_hh.cc b/pdns/test-communicator_hh.cc
index 427846fb095c2d32c6cba77125ce6892a1fa73c6..9d389bcf3b432967189dc3b28b915a8d4e69aee4 100644 (file)
--- a/pdns/test-communicator_hh.cc
+++ b/pdns/test-communicator_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-credentials_cc.cc b/pdns/test-credentials_cc.cc
index 109f2b0c7b5311ae8dc70ea034db745df0ba69af..ae71485818f9a351f76b74eafa8c47952858c16a 100644 (file)
--- a/pdns/test-credentials_cc.cc
+++ b/pdns/test-credentials_cc.cc
@@ -1,5 +1,8 @@
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/algorithm/string.hpp>

diff --git a/pdns/test-digests_hh.cc b/pdns/test-digests_hh.cc
index 79ab4d73ba7841a6e1b03aa0f91271521f99cbdb..124b525b0ca7b7abe0e97a3837a0671ef031eee1 100644 (file)
--- a/pdns/test-digests_hh.cc
+++ b/pdns/test-digests_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-distributor_hh.cc b/pdns/test-distributor_hh.cc
index 679b1fa6c29c506ac0dce637586fb127340d41e7..14527c06ab285dd0e6556dfc4b578f8672644cb0 100644 (file)
--- a/pdns/test-distributor_hh.cc
+++ b/pdns/test-distributor_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-dns_random_hh.cc b/pdns/test-dns_random_hh.cc
index d41f0d4b0223c77d41a0b6dda6c025ac3d45a8d6..8d525424465f7e9dc8a18696680d23966db05837 100644 (file)
--- a/pdns/test-dns_random_hh.cc
+++ b/pdns/test-dns_random_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-dnscrypt_cc.cc b/pdns/test-dnscrypt_cc.cc
index f19010c738aee7d4d623c3ac23d87c5e50af68cd..5df51acc58db4ef822a076a9cba421b5aca73a86 100644 (file)
--- a/pdns/test-dnscrypt_cc.cc
+++ b/pdns/test-dnscrypt_cc.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/test-dnsdist_cc.cc b/pdns/test-dnsdist_cc.cc
index c51a930c04f8566c09a959e927374133f4a11a5a..56f31d2348b1ba07936ccbaee1e153a452e216ca 100644 (file)
--- a/pdns/test-dnsdist_cc.cc
+++ b/pdns/test-dnsdist_cc.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/test-dnsdistpacketcache_cc.cc b/pdns/test-dnsdistpacketcache_cc.cc
index 63a86fef7694c1925e2621835e1a5e7791e5d071..14fceb06fac592b689835ce76ea024912e6d048d 100644 (file)
--- a/pdns/test-dnsdistpacketcache_cc.cc
+++ b/pdns/test-dnsdistpacketcache_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/test-dnsname_cc.cc b/pdns/test-dnsname_cc.cc
index b3b442a46df6a8274d8b821ae231a0cd733eb73f..6498e3dfa99dbe046e964577638e3a406b2a7bb1 100644 (file)
--- a/pdns/test-dnsname_cc.cc
+++ b/pdns/test-dnsname_cc.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #include <boost/test/unit_test.hpp>
 
 #include <cmath>

diff --git a/pdns/test-dnsparser_cc.cc b/pdns/test-dnsparser_cc.cc
index 05894f3343a3d5ebdf44712720345b458ab64336..79da18a27cbe26f976e1a8532dcb2a98171e08f2 100644 (file)
--- a/pdns/test-dnsparser_cc.cc
+++ b/pdns/test-dnsparser_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-dnsparser_hh.cc b/pdns/test-dnsparser_hh.cc
index 61657430caf71ad0b1f3e6bd8f220a418892e0ff..422eda57622680ce47ae62eaab8af5ebd27d2d01 100644 (file)
--- a/pdns/test-dnsparser_hh.cc
+++ b/pdns/test-dnsparser_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-dnsrecordcontent.cc b/pdns/test-dnsrecordcontent.cc
index b5811dafa4fed59c21028fed409ecfed5e72855e..d3488e65dc69348b1a8c062a28717b817914745a 100644 (file)
--- a/pdns/test-dnsrecordcontent.cc
+++ b/pdns/test-dnsrecordcontent.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-dnsrecords_cc.cc b/pdns/test-dnsrecords_cc.cc
index e3c5fe1e33053e37752025249ec4a92dda1a369b..3e65d783f73cf0fe27a2f743d9b5d8c072921526 100644 (file)
--- a/pdns/test-dnsrecords_cc.cc
+++ b/pdns/test-dnsrecords_cc.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/pdns/test-dnswriter_cc.cc b/pdns/test-dnswriter_cc.cc
index bef0a81c61465175cc75a3b55ed978c2105d066c..b7cee5a0fb4fd77104a8549ae5acc36566cf904d 100644 (file)
--- a/pdns/test-dnswriter_cc.cc
+++ b/pdns/test-dnswriter_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-ednscookie_cc.cc b/pdns/test-ednscookie_cc.cc
index 556429fcfb4393d38b5714718bafbc6be3f30370..e6c6d5bc87eb4633fc22b66020395d76169effd2 100644 (file)
--- a/pdns/test-ednscookie_cc.cc
+++ b/pdns/test-ednscookie_cc.cc
@@ -19,7 +19,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-ipcrypt_cc.cc b/pdns/test-ipcrypt_cc.cc
index fe3897ad5a4012181d60aac3fe1a97365c7436c1..837d394e7c2f22cec3d9b306abf3fdc081b39735 100644 (file)
--- a/pdns/test-ipcrypt_cc.cc
+++ b/pdns/test-ipcrypt_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-iputils_hh.cc b/pdns/test-iputils_hh.cc
index da21868b06f74cb9eb7f5e99dac8047e9563d222..b30df736472c70894cd0f2d91be62ee01dcc0cda 100644 (file)
--- a/pdns/test-iputils_hh.cc
+++ b/pdns/test-iputils_hh.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/pdns/test-ixfr_cc.cc b/pdns/test-ixfr_cc.cc
index 48127d3cd6534f6fc59c5a4b554bef049a34ab09..421e595984192221a7bf974edc083377a0580a31 100644 (file)
--- a/pdns/test-ixfr_cc.cc
+++ b/pdns/test-ixfr_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-lock_hh.cc b/pdns/test-lock_hh.cc
index 112be6f016a64fc15ccb7091433bda3263d37e58..00669cc380f3ae9fb82330b6b0f32c533a62cbe6 100644 (file)
--- a/pdns/test-lock_hh.cc
+++ b/pdns/test-lock_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/test-lua_auth4_cc.cc b/pdns/test-lua_auth4_cc.cc
index 7fdf4f1f41888c4a64cba99680c111e9487f6746..3bf05b5c7860e842ff645512300a8da4dcede8b6 100644 (file)
--- a/pdns/test-lua_auth4_cc.cc
+++ b/pdns/test-lua_auth4_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-luawrapper.cc b/pdns/test-luawrapper.cc
index 10047902318e8fdfb68297d7d3c3662ccdda5ed7..dd01254db9096e2ddd3825ddaff1cf6f70108cda 100644 (file)
--- a/pdns/test-luawrapper.cc
+++ b/pdns/test-luawrapper.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/pdns/test-misc_hh.cc b/pdns/test-misc_hh.cc
index b3f0b3a4c223e30e40357c66f7626a9120dfeaed..bb903d6236050b126c35c21c30458f6eefbe5852 100644 (file)
--- a/pdns/test-misc_hh.cc
+++ b/pdns/test-misc_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-mplexer.cc b/pdns/test-mplexer.cc
index 4c2b44d9bad648ea211a646fcb79da671a0ccf4a..20a2365bec2ada25eac4d94031866cff969fee46 100644 (file)
--- a/pdns/test-mplexer.cc
+++ b/pdns/test-mplexer.cc
@@ -1,5 +1,7 @@
-
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <thread>

diff --git a/pdns/test-nameserver_cc.cc b/pdns/test-nameserver_cc.cc
index 0517b076f67b3a485310e972eeb635641e8b421e..0dccf727731df1a9b47673705189a55529dfbb7b 100644 (file)
--- a/pdns/test-nameserver_cc.cc
+++ b/pdns/test-nameserver_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-packetcache_cc.cc b/pdns/test-packetcache_cc.cc
index 4b3a39936a1e6b324f7bdf9d36b657defb0c81e9..166a11dab4a77472f783b7206d3db98390158964 100644 (file)
--- a/pdns/test-packetcache_cc.cc
+++ b/pdns/test-packetcache_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-packetcache_hh.cc b/pdns/test-packetcache_hh.cc
index e43627310cc5daa2b6196e4d89b0f7b3265018f3..8d1bc24dfe3e21bdec352b08725acf9800f610ed 100644 (file)
--- a/pdns/test-packetcache_hh.cc
+++ b/pdns/test-packetcache_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-proxy_protocol_cc.cc b/pdns/test-proxy_protocol_cc.cc
index 6a672c4dac01ba6cfbda4fd0421d529907b6762c..7cee098d8377d602a752d704cf050773c5c35691 100644 (file)
--- a/pdns/test-proxy_protocol_cc.cc
+++ b/pdns/test-proxy_protocol_cc.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #include <boost/test/unit_test.hpp>
 
 #include "iputils.hh"

diff --git a/pdns/test-rcpgenerator_cc.cc b/pdns/test-rcpgenerator_cc.cc
index 0987108e228777a636aa07e7f7e9af6204859294..c78495bcd64ee3ff883729a52c18eb3748654a04 100644 (file)
--- a/pdns/test-rcpgenerator_cc.cc
+++ b/pdns/test-rcpgenerator_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-sha_hh.cc b/pdns/test-sha_hh.cc
index a0753bc9a6a7592ae5b20008e858bc5ceb158f9b..8eebf5f943c54050c6e10c8750c18ba80183513c 100644 (file)
--- a/pdns/test-sha_hh.cc
+++ b/pdns/test-sha_hh.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/pdns/test-sholder_hh.cc b/pdns/test-sholder_hh.cc
index cf0d70662381459861bee3b274393e411c2291a2..3ca40e462543f99f2a4f318b9d3cbfda61a2c6b1 100644 (file)
--- a/pdns/test-sholder_hh.cc
+++ b/pdns/test-sholder_hh.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/test-signers.cc b/pdns/test-signers.cc
index f92fedb1748729c3b279f7229b0accedd55675a2..456573d9c72cc92c0b402b4afb4052edf938a4f0 100644 (file)
--- a/pdns/test-signers.cc
+++ b/pdns/test-signers.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/pdns/test-statbag_cc.cc b/pdns/test-statbag_cc.cc
index 4a36d38fc232482414ed26eb2ea0dda2a1fc6964..bbde1705e2bee5f942ae269536888af01833df68 100644 (file)
--- a/pdns/test-statbag_cc.cc
+++ b/pdns/test-statbag_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-svc_records_cc.cc b/pdns/test-svc_records_cc.cc
index 98b41d25b7deb15affb4cb3aa1fc888a463ea1fb..bb7f08d2efeadcbf08caeae4fcc93ff98158fedf 100644 (file)
--- a/pdns/test-svc_records_cc.cc
+++ b/pdns/test-svc_records_cc.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/pdns/test-trusted-notification-proxy_cc.cc b/pdns/test-trusted-notification-proxy_cc.cc
index 689e5c86cc09195d084619844cb221b363d3e999..b477683c9aa322a314606b86ed36900540fe95d9 100644 (file)
--- a/pdns/test-trusted-notification-proxy_cc.cc
+++ b/pdns/test-trusted-notification-proxy_cc.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #include <boost/test/unit_test.hpp>
 #include "trusted-notification-proxy.hh"
 

diff --git a/pdns/test-tsig.cc b/pdns/test-tsig.cc
index 8dc1ac868baadbdcc5fdcff73885d04685cdaf6e..08c90828dea95fc74d4b6700d92ca1fbbd222e44 100644 (file)
--- a/pdns/test-tsig.cc
+++ b/pdns/test-tsig.cc
@@ -21,7 +21,10 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-ueberbackend_cc.cc b/pdns/test-ueberbackend_cc.cc
index 1bde35389a100eb20573dc6fd93f9aba9283e222..b6a1cc3c12d22fe421b8c907ec76317dd0ec402b 100644 (file)
--- a/pdns/test-ueberbackend_cc.cc
+++ b/pdns/test-ueberbackend_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #ifdef HAVE_CONFIG_H

diff --git a/pdns/test-webserver_cc.cc b/pdns/test-webserver_cc.cc
index 5003dbb220c6eadf34cbaefba2c6fcf8bca25b7e..c0f8335a8793e0d4e904462d675cb2a17b8020ea 100644 (file)
--- a/pdns/test-webserver_cc.cc
+++ b/pdns/test-webserver_cc.cc
@@ -1,4 +1,7 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>

diff --git a/pdns/test-zonemd_cc.cc b/pdns/test-zonemd_cc.cc
index 08c282c7db049fddd428e1fb5beb5a0d53bb5887..3743dd17e7300497f87b2e62035dd0a9461cdc22 100644 (file)
--- a/pdns/test-zonemd_cc.cc
+++ b/pdns/test-zonemd_cc.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #include <boost/test/unit_test.hpp>
 
 #include "zonemd.hh"

diff --git a/pdns/test-zoneparser_tng_cc.cc b/pdns/test-zoneparser_tng_cc.cc
index 78f273162fc889a5bfda7512fd598a283fa71a4a..2502db32f3002e3ea47f64e5d9ab989158dd2c2a 100644 (file)
--- a/pdns/test-zoneparser_tng_cc.cc
+++ b/pdns/test-zoneparser_tng_cc.cc
@@ -1,5 +1,9 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
+
 #define BOOST_TEST_NO_MAIN
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/pdns/testrunner.cc b/pdns/testrunner.cc
index 0a7255e1c6bfc97e051db99a462d6a1c44efa2c0..ef4f16a014e7b012ebf2024a4e27bcbc3b188f24 100644 (file)
--- a/pdns/testrunner.cc
+++ b/pdns/testrunner.cc
@@ -1,4 +1,6 @@
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"