Fix bad tests for sub-BSD OS detections that resulted in sub-BSD flavors

being detected but appearing that the super-BSD was not detected.
2013-09-26 22:15:27 -05:00
parent 141ac4b01a
commit 1b12a19027
5 changed files with 10 additions and 5 deletions
--- a/include/boost/predef/os/bsd/bsdi.h
+++ b/include/boost/predef/os/bsd/bsdi.h
@@ -25,8 +25,9 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE

 #if defined(__bsdi__)
-#   ifndef BOOST_OS_BSD
+#   ifndef BOOST_OS_BSD_AVAILABLE
 #       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+#       define BOOST_OS_BSD_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_BSDI
 #   define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_AVAILABLE
--- a/include/boost/predef/os/bsd/dragonfly.h
+++ b/include/boost/predef/os/bsd/dragonfly.h
@@ -25,8 +25,9 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE

 #if defined(__DragonFly__)
-#   ifndef BOOST_OS_BSD
+#   ifndef BOOST_OS_BSD_AVAILABLE
 #       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+#       define BOOST_OS_BSD_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_DRAGONFLY
 #   if defined(__DragonFly__)
--- a/include/boost/predef/os/bsd/free.h
+++ b/include/boost/predef/os/bsd/free.h
@@ -27,8 +27,9 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE

 #if defined(__FreeBSD__)
-#   ifndef BOOST_OS_BSD
+#   ifndef BOOST_OS_BSD_AVAILABLE
 #       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+#       define BOOST_OS_BSD_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_FREE
 #   if defined(__FreeBSD_version)
--- a/include/boost/predef/os/bsd/net.h
+++ b/include/boost/predef/os/bsd/net.h
@@ -32,8 +32,9 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE

 #if defined(__NETBSD__) || defined(__NetBSD__)
-#   ifndef BOOST_OS_BSD
+#   ifndef BOOST_OS_BSD_AVAILABLE
 #       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+#       define BOOST_OS_BSD_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_NET
 #   if defined(__NETBSD__)
--- a/include/boost/predef/os/bsd/open.h
+++ b/include/boost/predef/os/bsd/open.h
@@ -56,8 +56,9 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE

 #if defined(__OpenBSD__)
-#   ifndef BOOST_OS_BSD
+#   ifndef BOOST_OS_BSD_AVAILABLE
 #       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+#       define BOOST_OS_BSD_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_OPEN
 #   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_0)