Avoid undefining BOOST_AUTO_LINK_NOMANGLE

Avoid undefining BOOST_AUTO_LINK_NOMANGLE if it was previously defined.
camolezi · Apr 19, 2019 · 32469a6 · 32469a6
1 parent 614108a
commit 32469a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/include/boost/uuid/detail/random_provider_bcrypt.ipp b/include/boost/uuid/detail/random_provider_bcrypt.ipp
@@ -19,9 +19,13 @@
 
 #if defined(BOOST_UUID_FORCE_AUTO_LINK) || (!defined(BOOST_ALL_NO_LIB) && !defined(BOOST_UUID_RANDOM_PROVIDER_NO_LIB))
 #   define BOOST_LIB_NAME "bcrypt"
-#   define BOOST_AUTO_LINK_NOMANGLE
-#   include <boost/config/auto_link.hpp>
-#   undef BOOST_AUTO_LINK_NOMANGLE
+#   if defined(BOOST_AUTO_LINK_NOMANGLE)
+#      include <boost/config/auto_link.hpp>
+#   else
+#      define BOOST_AUTO_LINK_NOMANGLE
+#      include <boost/config/auto_link.hpp>
+#      undef BOOST_AUTO_LINK_NOMANGLE
+#   endif
 #endif
 
 namespace boost {

diff --git a/include/boost/uuid/detail/random_provider_wincrypt.ipp b/include/boost/uuid/detail/random_provider_wincrypt.ipp
@@ -27,9 +27,13 @@
 #   else
 #      define BOOST_LIB_NAME "advapi32"
 #   endif
-#   define BOOST_AUTO_LINK_NOMANGLE
-#   include <boost/config/auto_link.hpp>
-#   undef BOOST_AUTO_LINK_NOMANGLE
+#   if defined(BOOST_AUTO_LINK_NOMANGLE)
+#      include <boost/config/auto_link.hpp>
+#   else
+#      define BOOST_AUTO_LINK_NOMANGLE
+#      include <boost/config/auto_link.hpp>
+#      undef BOOST_AUTO_LINK_NOMANGLE
+#   endif
 #endif
 
 namespace boost {