From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 5 Jan 2021 13:07:22 +0000 (+0100)
Subject: MacOS (both Intel and arm64) and OpenBSD have no issues any more
X-Git-Tag: rec-4.5.0-alpha1~37^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F9911%2Fhead;p=thirdparty%2Fpdns.git

MacOS (both Intel and arm64) and OpenBSD have no issues any more
with boost::containter::string
---

diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh
index ab1bb8680e..10a4f0d2b1 100644
--- a/pdns/dnsname.hh
+++ b/pdns/dnsname.hh
@@ -33,8 +33,7 @@
 
 #include <boost/version.hpp>
 
-// it crashes on OSX and doesn't compile on OpenBSD
-#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__)
+#if BOOST_VERSION >= 105300
 #include <boost/container/string.hpp>
 #endif
 
@@ -158,7 +157,7 @@ public:
   inline bool canonCompare(const DNSName& rhs) const;
   bool slowCanonCompare(const DNSName& rhs) const;  
 
-#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__)
+#if BOOST_VERSION >= 105300
   typedef boost::container::string string_t;
 #else
   typedef std::string string_t;