From 335aef35c91e59f632673618c0ba015887f9be08 Mon Sep 17 00:00:00 2001
From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Fri, 1 Jul 2022 12:01:06 +0100
Subject: [PATCH] The Boost meson module sets this on the command-line, so
 avoid compiler warning when redefining

---
 src/test/TestAllocators.cpp        | 2 ++
 src/test/TestBinClassifier.cpp     | 2 ++
 src/test/TestFFT.cpp               | 2 ++
 src/test/TestResampler.cpp         | 2 ++
 src/test/TestSignalBits.cpp        | 2 ++
 src/test/TestStretchCalculator.cpp | 2 ++
 src/test/TestStretcher.cpp         | 2 ++
 src/test/TestVectorOps.cpp         | 2 ++
 src/test/TestVectorOpsComplex.cpp  | 2 ++
 src/test/test.cpp                  | 2 ++
 10 files changed, 20 insertions(+)

diff --git a/src/test/TestAllocators.cpp b/src/test/TestAllocators.cpp
index 32f547e..71f0548 100644
--- a/src/test/TestAllocators.cpp
+++ b/src/test/TestAllocators.cpp
@@ -21,7 +21,9 @@
     you must obtain a valid commercial licence before doing so.
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>
 
 #include "../common/VectorOps.h"
diff --git a/src/test/TestBinClassifier.cpp b/src/test/TestBinClassifier.cpp
index f1786ab..303ffe7 100644
--- a/src/test/TestBinClassifier.cpp
+++ b/src/test/TestBinClassifier.cpp
@@ -21,7 +21,9 @@
     you must obtain a valid commercial licence before doing so.
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>
 
 // This test suite (shallowly) tests both BinClassifier and BinSegmenter
diff --git a/src/test/TestFFT.cpp b/src/test/TestFFT.cpp
index 78b5df2..d915778 100644
--- a/src/test/TestFFT.cpp
+++ b/src/test/TestFFT.cpp
@@ -21,7 +21,9 @@
     you must obtain a valid commercial licence before doing so.
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>
 
 #include "../common/FFT.h"
diff --git a/src/test/TestResampler.cpp b/src/test/TestResampler.cpp
index 774c2b5..b7b5bb3 100644
--- a/src/test/TestResampler.cpp
+++ b/src/test/TestResampler.cpp
@@ -21,7 +21,9 @@
     you must obtain a valid commercial licence before doing so.
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>
 
 #include "../common/Resampler.h"
diff --git a/src/test/TestSignalBits.cpp b/src/test/TestSignalBits.cpp
index bd56248..70c073f 100644
--- a/src/test/TestSignalBits.cpp
+++ b/src/test/TestSignalBits.cpp
@@ -21,7 +21,9 @@
     you must obtain a valid commercial licence before doing so.
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>
 
 #include "../common/MovingMedian.h"
diff --git a/src/test/TestStretchCalculator.cpp b/src/test/TestStretchCalculator.cpp
index ffe7d44..ae48056 100644
--- a/src/test/TestStretchCalculator.cpp
+++ b/src/test/TestStretchCalculator.cpp
@@ -21,7 +21,9 @@
     you must obtain a valid commercial licence before doing so.
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>
 
 #include "../common/StretchCalculator.h"
diff --git a/src/test/TestStretcher.cpp b/src/test/TestStretcher.cpp
index 49b0ce1..37fb569 100644
--- a/src/test/TestStretcher.cpp
+++ b/src/test/TestStretcher.cpp
@@ -21,7 +21,9 @@
     you must obtain a valid commercial licence before doing so.
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>
 
 #include "../../rubberband/RubberBandStretcher.h"
diff --git a/src/test/TestVectorOps.cpp b/src/test/TestVectorOps.cpp
index 615a89f..8f2803f 100644
--- a/src/test/TestVectorOps.cpp
+++ b/src/test/TestVectorOps.cpp
@@ -21,7 +21,9 @@
     you must obtain a valid commercial licence before doing so.
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>
 
 #include "../common/VectorOps.h"
diff --git a/src/test/TestVectorOpsComplex.cpp b/src/test/TestVectorOpsComplex.cpp
index dd73cd8..0eebf5d 100644
--- a/src/test/TestVectorOpsComplex.cpp
+++ b/src/test/TestVectorOpsComplex.cpp
@@ -21,7 +21,9 @@
     you must obtain a valid commercial licence before doing so.
 */
 
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>
 
 #include "../common/VectorOpsComplex.h"
diff --git a/src/test/test.cpp b/src/test/test.cpp
index e5fda23..b290077 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -22,5 +22,7 @@
 */
 
 #define BOOST_TEST_MODULE RubberBand
+#ifndef BOOST_TEST_DYN_LINK
 #define BOOST_TEST_DYN_LINK
+#endif
 #include <boost/test/unit_test.hpp>