Most changes from review comments implemented. Remove use of "#elif" for

backward PP compatability. Add BOOST_category_item_AVAILABLE as a
defined, or not, symbol for use with "#ifdef" or "#ifndef". Add
documentation of macros used for detection and version information. Also
replace direct use of BVN(0,0,0) and BVN(0,0,1) with more meaningful
macros that are globally defined, and hence consistent.

include/boost/predef/os/aix.h

@@ -30,21 +30,29 @@ Version number available as major, minor, and patch.
     ]
  */
 
-#define BOOST_OS_AIX BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_AIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(_AIX) || defined(__TOS_AIX__)
 #   undef BOOST_OS_AIX
-#   if defined(_AIX43)
+#   if !defined(BOOST_OS_AIX) && defined(_AIX43)
 #       define BOOST_OS_AIX BOOST_VERSION_NUMBER(4,3,0)
-#   elif defined(_AIX41)
-#       define BOOST_OS_AIX BOOST_VERSION_NUMBER(4,1,0)
-#   elif defined(_AIX32)
-#       define BOOST_OS_AIX BOOST_VERSION_NUMBER(3,2,0)
-#   elif defined(_AIX3)
-#       define BOOST_OS_AIX BOOST_VERSION_NUMBER(3,0,0)
-#   else
-#       define BOOST_OS_AIX BOOST_VERSION_NUMBER(0,0,1)
 #   endif
+#   if !defined(BOOST_OS_AIX) && defined(_AIX41)
+#       define BOOST_OS_AIX BOOST_VERSION_NUMBER(4,1,0)
+#   endif
+#   if !defined(BOOST_OS_AIX) && defined(_AIX32)
+#       define BOOST_OS_AIX BOOST_VERSION_NUMBER(3,2,0)
+#   endif
+#   if !defined(BOOST_OS_AIX) && defined(_AIX3)
+#       define BOOST_OS_AIX BOOST_VERSION_NUMBER(3,0,0)
+#   endif
+#   if !defined(BOOST_OS_AIX)
+#       define BOOST_OS_AIX BOOST_VERSION_NUMBER_AVAILABLE
+#   endif
+#endif
+
+#if BOOST_OS_AIX
+#   define BOOST_OS_AIX_AVAILABLE
 #endif
 
 #define BOOST_OS_AIX_NAME "IBM AIX"

include/boost/predef/os/amigaos.h

@@ -24,11 +24,15 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(AMIGA) || defined(__amigaos__)
 #   undef BOOST_OS_AMIGAOS
-#   define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_AMIGAOS
+#   define BOOST_OS_AMIGAOS_AVAILABLE
 #endif
 
 #define BOOST_OS_AMIGAOS_NAME "AmigaOS"

include/boost/predef/os/beos.h

@@ -23,11 +23,15 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_BEOS BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_BEOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__BEOS__)
 #   undef BOOST_OS_BEOS
-#   define BOOST_OS_BEOS BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_BEOS BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_BEOS
+#   define BOOST_OS_BEOS_AVAILABLE
 #endif
 
 #define BOOST_OS_BEOS_NAME "BeOS"

include/boost/predef/os/bsd.h

@@ -42,23 +42,31 @@ of BSD. If the above variants is detected the corresponding macro is also set.]
     ]
  */
 
-#define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(BSD) || \
     defined(_SYSTYPE_BSD)
 #   undef BOOST_OS_BSD
 #   include <sys/param.h>
-#   if defined(BSD4_2)
+#   if !defined(BOOST_OS_BSD) && defined(BSD4_2)
 #       define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,2,0)
-#   elif defined(BSD4_3)
-#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,3,0)
-#   elif defined(BSD4_4)
-#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,4,0)
-#   elif defined(BSD)
-#       define BOOST_OS_BSD BOOST_PREDEF_MAKE_10_VVRR(BSD)
-#   else
-#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1)
 #   endif
+#   if !defined(BOOST_OS_BSD) && defined(BSD4_3)
+#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,3,0)
+#   endif
+#   if !defined(BOOST_OS_BSD) && defined(BSD4_4)
+#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,4,0)
+#   endif
+#   if !defined(BOOST_OS_BSD) && defined(BSD)
+#       define BOOST_OS_BSD BOOST_PREDEF_MAKE_10_VVRR(BSD)
+#   endif
+#   if !defined(BOOST_OS_BSD)
+#       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+#   endif
+#endif
+
+#if BOOST_OS_BSD
+#   define BOOST_OS_BSD_AVAILABLE
 #endif
 
 #define BOOST_OS_BSD_NAME "BSD"

include/boost/predef/os/bsd/bsdi.h

@@ -22,14 +22,18 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__bsdi__)
 #   ifndef BOOST_OS_BSD
-#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1)
+#       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_BSDI
-#   define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_BSD_BSDI
+#   define BOOST_OS_BSD_BSDI_AVAILABLE
 #endif
 
 #define BOOST_OS_BSD_BSDI_NAME "BSDi BSD/OS"

include/boost/predef/os/bsd/dragonfly.h

@@ -22,18 +22,22 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__DragonFly__)
 #   ifndef BOOST_OS_BSD
-#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1)
+#       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_DRAGONFLY
 #   if defined(__DragonFly__)
-#       define BOOST_OS_DRAGONFLY_BSD BOOST_VERSION_NUMBER(0,0,1)
+#       define BOOST_OS_DRAGONFLY_BSD BOOST_VERSION_NUMBER_AVAILABLE
 #   endif
 #endif
 
+#if BOOST_OS_BSD_DRAGONFLY
+#   define BOOST_OS_BSD_DRAGONFLY_AVAILABLE
+#endif
+
 #define BOOST_OS_BSD_DRAGONFLY_NAME "DragonFly BSD"
 
 #include <boost/predef/detail/test.h>

include/boost/predef/os/bsd/free.h

@@ -24,11 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__FreeBSD__)
 #   ifndef BOOST_OS_BSD
-#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1)
+#       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_FREE
 #   if defined(__FreeBSD_version)
@@ -40,10 +40,14 @@ http://www.boost.org/LICENSE_1_0.txt)
                 BOOST_PREDEF_MAKE_10_VRR000(__FreeBSD_version)
 #       endif
 #   else
-#       define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER(0,0,1)
+#       define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_AVAILABLE
 #   endif
 #endif
 
+#if BOOST_OS_BSD_FREE
+#   define BOOST_OS_BSD_FREE_AVAILABLE
+#endif
+
 #define BOOST_OS_BSD_FREE_NAME "Free BSD"
 
 #include <boost/predef/detail/test.h>

include/boost/predef/os/bsd/net.h

@@ -29,11 +29,11 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__NETBSD__) || defined(__NetBSD__)
 #   ifndef BOOST_OS_BSD
-#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1)
+#       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_NET
 #   if defined(__NETBSD__)
@@ -46,24 +46,32 @@ http://www.boost.org/LICENSE_1_0.txt)
                     BOOST_PREDEF_MAKE_10_VRR000(__NETBSD_version)
 #           endif
 #       else
-#           define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,0,1)
+#           define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_AVAILABLE
 #       endif
 #   elif defined(__NetBSD__)
-#       if defined(NetBSD0_8)
+#       if !defined(BOOST_OS_BSD_NET) && defined(NetBSD0_8)
 #           define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,8,0)
-#       elif defined(NetBSD0_9)
+#       endif
+#       if !defined(BOOST_OS_BSD_NET) && defined(NetBSD0_9)
 #           define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,9,0)
-#       elif defined(NetBSD1_0)
+#       endif
+#       if !defined(BOOST_OS_BSD_NET) && defined(NetBSD1_0)
 #           define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(1,0,0)
-#       elif defined(__NetBSD_Version)
+#       endif
+#       if !defined(BOOST_OS_BSD_NET) && defined(__NetBSD_Version)
 #           define BOOST_OS_BSD_NET \
                 BOOST_PREDEF_MAKE_10_VVRR00PP00(__NetBSD_Version)
-#       else
-#           define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,0,1)
+#       endif
+#       if !defined(BOOST_OS_BSD_NET)
+#           define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_AVAILABLE
 #       endif
 #   endif
 #endif
 
+#if BOOST_OS_BSD_NET
+#   define BOOST_OS_BSD_NET_AVAILABLE
+#endif
+
 #define BOOST_OS_BSD_NET_NAME "DragonFly BSD"
 
 #include <boost/predef/detail/test.h>

include/boost/predef/os/bsd/open.h

@@ -53,76 +53,110 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__OpenBSD__)
 #   ifndef BOOST_OS_BSD
-#       define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1)
+#       define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
 #   endif
 #   undef BOOST_OS_BSD_OPEN
-#   if defined(OpenBSD2_0)
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_0)
 #       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,0,0)
-#   elif defined(OpenBSD2_1)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,1,0)
-#   elif defined(OpenBSD2_2)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,2,0)
-#   elif defined(OpenBSD2_3)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,3,0)
-#   elif defined(OpenBSD2_4)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,4,0)
-#   elif defined(OpenBSD2_5)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,5,0)
-#   elif defined(OpenBSD2_6)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,6,0)
-#   elif defined(OpenBSD2_7)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,7,0)
-#   elif defined(OpenBSD2_8)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,8,0)
-#   elif defined(OpenBSD2_9)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,9,0)
-#   elif defined(OpenBSD3_0)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,0,0)
-#   elif defined(OpenBSD3_1)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,1,0)
-#   elif defined(OpenBSD3_2)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,2,0)
-#   elif defined(OpenBSD3_3)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,3,0)
-#   elif defined(OpenBSD3_4)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,4,0)
-#   elif defined(OpenBSD3_5)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,5,0)
-#   elif defined(OpenBSD3_6)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,6,0)
-#   elif defined(OpenBSD3_7)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,7,0)
-#   elif defined(OpenBSD3_8)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,8,0)
-#   elif defined(OpenBSD3_9)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,9,0)
-#   elif defined(OpenBSD4_0)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,0,0)
-#   elif defined(OpenBSD4_1)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,1,0)
-#   elif defined(OpenBSD4_2)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,2,0)
-#   elif defined(OpenBSD4_3)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,3,0)
-#   elif defined(OpenBSD4_4)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,4,0)
-#   elif defined(OpenBSD4_5)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,5,0)
-#   elif defined(OpenBSD4_6)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,6,0)
-#   elif defined(OpenBSD4_7)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,7,0)
-#   elif defined(OpenBSD4_8)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,8,0)
-#   elif defined(OpenBSD4_9)
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,9,0)
-#   else
-#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(0,0,1)
 #   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_1)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,1,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_2)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,2,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_3)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,3,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_4)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,4,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_5)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,5,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_6)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,6,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_7)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,7,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_8)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,8,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_9)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,9,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_0)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,0,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_1)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,1,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_2)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,2,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_3)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,3,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_4)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,4,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_5)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,5,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_6)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,6,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_7)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,7,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_8)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,8,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD3_9)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,9,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_0)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,0,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_1)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,1,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_2)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,2,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_3)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,3,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_4)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,4,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_5)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,5,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_6)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,6,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_7)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,7,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_8)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,8,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_9)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,9,0)
+#   endif
+#   if !defined(BOOST_OS_BSD_OPEN)
+#       define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_AVAILABLE
+#   endif
+#endif
+
+#if BOOST_OS_BSD_OPEN
+#   define BOOST_OS_BSD_OPEN_AVAILABLE
 #endif
 
 #define BOOST_OS_BSD_OPEN_NAME "OpenBSD"

include/boost/predef/os/cygwin.h

@@ -23,11 +23,15 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__CYGWIN__)
 #   undef BOOST_OS_CYGWIN
-#   define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_CYGWIN
+#   define BOOST_OS_CYGWIN_AVAILABLE
 #endif
 
 #define BOOST_OS_CYGWIN_NAME "Cygwin"

include/boost/predef/os/hpux.h

@@ -25,11 +25,15 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_HPUX BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_HPUX BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(hpux) || defined(_hpux) || defined(__hpux)
 #   undef BOOST_OS_HPUX
-#   define BOOST_OS_HPUX BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_HPUX BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_HPUX
+#   define BOOST_OS_HPUX_AVAILABLE
 #endif
 
 #define BOOST_OS_HPUX_NAME "HP-UX"

include/boost/predef/os/irix.h

@@ -24,11 +24,15 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_IRIX BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_IRIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(sgi) || defined(__sgi)
 #   undef BOOST_OS_IRIX
-#   define BOOST_OS_IRIX BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_IRIX BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_IRIX
+#   define BOOST_OS_IRIX_AVAILABLE
 #endif
 
 #define BOOST_OS_IRIX_NAME "IRIX"

include/boost/predef/os/linux.h

@@ -24,11 +24,15 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_LINUX BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_LINUX BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(linux) || defined(__linux)
 #   undef BOOST_OS_LINUX
-#   define BOOST_OS_LINUX BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_LINUX BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_LINUX
+#   define BOOST_OS_LINUX_AVAILABLE
 #endif
 
 #define BOOST_OS_LINUX_NAME "Linux"

include/boost/predef/os/macos.h

@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_MACOS BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(macintosh) || defined(Macintosh) || \
     (defined(__APPLE__) && defined(__MACH__))
@@ -42,6 +42,10 @@ http://www.boost.org/LICENSE_1_0.txt)
 #   endif
 #endif
 
+#if BOOST_OS_MACOS
+#   define BOOST_OS_MACOS_AVAILABLE
+#endif
+
 #define BOOST_OS_MACOS_NAME "Mac OS"
 
 #include <boost/predef/detail/test.h>

include/boost/predef/os/os400.h

@@ -23,11 +23,15 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_OS400 BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_OS400 BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__OS400__)
 #   undef BOOST_OS_OS400
-#   define BOOST_OS_OS400 BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_OS400 BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_OS400
+#   define BOOST_OS_OS400_AVAILABLE
 #endif
 
 #define BOOST_OS_OS400_NAME "IBM OS/400"

include/boost/predef/os/qnxnto.h

@@ -29,17 +29,23 @@ version 4 is specifically detected.
     ]
  */
 
-#define BOOST_OS_QNX BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_QNX BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__QNX__) || defined(__QNXNTO__)
 #   undef BOOST_OS_QNX
-#   if defined(_NTO_VERSION)
+#   if !defined(BOOST_OS_QNX) && defined(_NTO_VERSION)
 #       define BOOST_OS_QNX BOOST_PREDEF_MAKE_10_VVRR(_NTO_VERSION)
-#   elif defined(__QNX__)
-#       define BOOST_OS_QNX BOOST_VERSION_NUMBER(4,0,0)
-#   else
-#       define BOOST_OS_QNX BOOST_VERSION_NUMBER(0,0,1)
 #   endif
+#   if !defined(BOOST_OS_QNX) && defined(__QNX__)
+#       define BOOST_OS_QNX BOOST_VERSION_NUMBER(4,0,0)
+#   endif
+#   if !defined(BOOST_OS_QNX)
+#       define BOOST_OS_QNX BOOST_VERSION_NUMBER_AVAILABLE
+#   endif
+#endif
+
+#if BOOST_OS_QNX
+#   define BOOST_OS_QNX_AVAILABLE
 #endif
 
 #define BOOST_OS_QNX_NAME "QNX"

include/boost/predef/os/solaris.h

@@ -24,11 +24,15 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(sun) || defined(__sun)
 #   undef BOOST_OS_SOLARIS
-#   define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_SOLARIS
+#   define BOOST_OS_SOLARIS_AVAILABLE
 #endif
 
 #define BOOST_OS_SOLARIS_NAME "Solaris"

include/boost/predef/os/unix.h

@@ -26,12 +26,16 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_UNIX BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_UNIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(unix) || defined(__unix) || \
     defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE)
 #   undef BOOST_OS_UNIX
-#   define BOOST_OS_UNIX BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_UNIX BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_UNIX
+#   define BOOST_OS_UNIX_AVAILABLE
 #endif
 
 #define BOOST_OS_UNIX_NAME "Unix Environment"
@@ -51,12 +55,16 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_SVR4 BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_SVR4 BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(__sysv__) || defined(__SVR4) || \
     defined(__svr4__) || defined(_SYSTYPE_SVR4)
 #   undef BOOST_OS_SVR4
-#   define BOOST_OS_SVR4 BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_SVR4 BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_ARCH_ALPHA
+#   define _AVAILABLE
 #endif
 
 #define BOOST_OS_SVR4_NAME "SVR4 Environment"

include/boost/predef/os/vms.h

@@ -26,17 +26,21 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_VMS BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_VMS BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(VMS) || defined(__VMS)
 #   undef BOOST_OS_VMS
 #   if defined(__VMS_VER)
 #       define BOOST_OS_VMS BOOST_PREDEF_MAKE_10_VVRR00PP00(__VMS_VER)
 #   else
-#       define BOOST_OS_VMS BOOST_VERSION_NUMBER(0,0,1)
+#       define BOOST_OS_VMS BOOST_VERSION_NUMBER_AVAILABLE
 #   endif
 #endif
 
+#if BOOST_OS_VMS
+#   define BOOST_OS_VMS_AVAILABLE
+#endif
+
 #define BOOST_OS_VMS_NAME "VMS"
 
 #include <boost/predef/detail/test.h>

include/boost/predef/os/windows.h

@@ -27,13 +27,17 @@ http://www.boost.org/LICENSE_1_0.txt)
     ]
  */
 
-#define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER(0,0,0)
+#define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #if defined(_WIN32) || defined(_WIN64) || \
     defined(__WIN32__) || defined(__TOS_WIN__) || \
     defined(__WINDOWS__)
 #   undef BOOST_OS_WINDOWS
-#   define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER(0,0,1)
+#   define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER_AVAILABLE
+#endif
+
+#if BOOST_OS_WINDOWS
+#   define BOOST_OS_WINDOWS_AVAILABLE
 #endif
 
 #define BOOST_OS_WINDOWS_NAME "Microsoft Windows"