[Boost-commit] svn:boost r85971 - trunk/boost/predef/os/bsd

Subject: [Boost-commit] svn:boost r85971 - trunk/boost/predef/os/bsd
From: grafikrobot_at_[hidden]
Date: 2013-09-26 23:50:33

Author: grafik
Date: 2013-09-26 23:50:32 EDT (Thu, 26 Sep 2013)
New Revision: 85971
URL: http://svn.boost.org/trac/boost/changeset/85971

Log:
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.

Text files modified: 
   trunk/boost/predef/os/bsd/bsdi.h      |     3 ++-                                     
   trunk/boost/predef/os/bsd/dragonfly.h |     3 ++-                                     
   trunk/boost/predef/os/bsd/free.h      |     3 ++-                                     
   trunk/boost/predef/os/bsd/net.h       |     3 ++-                                     
   trunk/boost/predef/os/bsd/open.h      |     3 ++-                                     
   5 files changed, 10 insertions(+), 5 deletions(-)

Modified: trunk/boost/predef/os/bsd/bsdi.h
==============================================================================
--- trunk/boost/predef/os/bsd/bsdi.h	Thu Sep 26 17:35:57 2013	(r85970)
+++ trunk/boost/predef/os/bsd/bsdi.h	2013-09-26 23:50:32 EDT (Thu, 26 Sep 2013)	(r85971)
@@ -25,8 +25,9 @@
 #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

Modified: trunk/boost/predef/os/bsd/dragonfly.h
==============================================================================
--- trunk/boost/predef/os/bsd/dragonfly.h	Thu Sep 26 17:35:57 2013	(r85970)
+++ trunk/boost/predef/os/bsd/dragonfly.h	2013-09-26 23:50:32 EDT (Thu, 26 Sep 2013)	(r85971)
@@ -25,8 +25,9 @@
 #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__)

Modified: trunk/boost/predef/os/bsd/free.h
==============================================================================
--- trunk/boost/predef/os/bsd/free.h	Thu Sep 26 17:35:57 2013	(r85970)
+++ trunk/boost/predef/os/bsd/free.h	2013-09-26 23:50:32 EDT (Thu, 26 Sep 2013)	(r85971)
@@ -27,8 +27,9 @@
 #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)

Modified: trunk/boost/predef/os/bsd/net.h
==============================================================================
--- trunk/boost/predef/os/bsd/net.h	Thu Sep 26 17:35:57 2013	(r85970)
+++ trunk/boost/predef/os/bsd/net.h	2013-09-26 23:50:32 EDT (Thu, 26 Sep 2013)	(r85971)
@@ -32,8 +32,9 @@
 #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__)

Modified: trunk/boost/predef/os/bsd/open.h
==============================================================================
--- trunk/boost/predef/os/bsd/open.h	Thu Sep 26 17:35:57 2013	(r85970)
+++ trunk/boost/predef/os/bsd/open.h	2013-09-26 23:50:32 EDT (Thu, 26 Sep 2013)	(r85971)
@@ -56,8 +56,9 @@
 #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)