boostorg/predef
1
0
Fork 1
mirror of https://github.com/boostorg/predef.git synced 2025-07-30 19:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from boostorg/develop

Browse Source 
Merge to master for 1.56 release.
This commit is contained in:
Rene Rivera
2014-07-09 09:07:56 -05:00
parent 43f9558eb4 372b4bd477
commit d98e1e6337
22 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/predef/os/aix.h
View File

@ -32,7 +32,7 @@ Version number available as major, minor, and patch.
#define BOOST_OS_AIX BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_AIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(_AIX) || defined(__TOS_AIX__) \ defined(_AIX) || defined(__TOS_AIX__) \
) )
# undef BOOST_OS_AIX # undef BOOST_OS_AIX

2
include/boost/predef/os/amigaos.h
View File

@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(AMIGA) || defined(__amigaos__) \ defined(AMIGA) || defined(__amigaos__) \
) )
# undef BOOST_OS_AMIGAOS # undef BOOST_OS_AMIGAOS

2
include/boost/predef/os/android.h
View File

@ -25,7 +25,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__ANDROID__) \ defined(__ANDROID__) \
) )
# undef BOOST_OS_ANDROID # undef BOOST_OS_ANDROID

2
include/boost/predef/os/beos.h
View File

@ -25,7 +25,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_BEOS BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_BEOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__BEOS__) \ defined(__BEOS__) \
) )
# undef BOOST_OS_BEOS # undef BOOST_OS_BEOS

2
include/boost/predef/os/bsd.h
View File

@ -59,7 +59,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.]
#define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE
#endif #endif
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(BSD) || \ defined(BSD) || \
defined(_SYSTYPE_BSD) \ defined(_SYSTYPE_BSD) \
) )

2
include/boost/predef/os/bsd/bsdi.h
View File

@ -24,7 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__bsdi__) \ defined(__bsdi__) \
) )
# ifndef BOOST_OS_BSD_AVAILABLE # ifndef BOOST_OS_BSD_AVAILABLE

2
include/boost/predef/os/bsd/dragonfly.h
View File

@ -24,7 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__DragonFly__) \ defined(__DragonFly__) \
) )
# ifndef BOOST_OS_BSD_AVAILABLE # ifndef BOOST_OS_BSD_AVAILABLE

2
include/boost/predef/os/bsd/free.h
View File

@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__FreeBSD__) \ defined(__FreeBSD__) \
) )
# ifndef BOOST_OS_BSD_AVAILABLE # ifndef BOOST_OS_BSD_AVAILABLE

2
include/boost/predef/os/bsd/net.h
View File

@ -31,7 +31,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__NETBSD__) || defined(__NetBSD__) \ defined(__NETBSD__) || defined(__NetBSD__) \
) )
# ifndef BOOST_OS_BSD_AVAILABLE # ifndef BOOST_OS_BSD_AVAILABLE

2
include/boost/predef/os/bsd/open.h
View File

@ -55,7 +55,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__OpenBSD__) \ defined(__OpenBSD__) \
) )
# ifndef BOOST_OS_BSD_AVAILABLE # ifndef BOOST_OS_BSD_AVAILABLE

2
include/boost/predef/os/cygwin.h
View File

@ -25,7 +25,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__CYGWIN__) \ defined(__CYGWIN__) \
) )
# undef BOOST_OS_CYGWIN # undef BOOST_OS_CYGWIN

2
include/boost/predef/os/hpux.h
View File

@ -27,7 +27,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_HPUX BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_HPUX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(hpux) || defined(_hpux) || defined(__hpux) \ defined(hpux) || defined(_hpux) || defined(__hpux) \
) )
# undef BOOST_OS_HPUX # undef BOOST_OS_HPUX

2
include/boost/predef/os/ios.h
View File

@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_IOS BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_IOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__APPLE__) && defined(__MACH__) && \ defined(__APPLE__) && defined(__MACH__) && \
defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) \ defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) \
) )

2
include/boost/predef/os/irix.h
View File

@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_IRIX BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_IRIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(sgi) || defined(__sgi) \ defined(sgi) || defined(__sgi) \
) )
# undef BOOST_OS_IRIX # undef BOOST_OS_IRIX

2
include/boost/predef/os/linux.h
View File

@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_LINUX BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_LINUX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(linux) || defined(__linux) \ defined(linux) || defined(__linux) \
) )
# undef BOOST_OS_LINUX # undef BOOST_OS_LINUX

2
include/boost/predef/os/macos.h
View File

@ -39,7 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(macintosh) || defined(Macintosh) || \ defined(macintosh) || defined(Macintosh) || \
(defined(__APPLE__) && defined(__MACH__)) \ (defined(__APPLE__) && defined(__MACH__)) \
) )

2
include/boost/predef/os/os400.h
View File

@ -25,7 +25,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_OS400 BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_OS400 BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__OS400__) \ defined(__OS400__) \
) )
# undef BOOST_OS_OS400 # undef BOOST_OS_OS400

2
include/boost/predef/os/qnxnto.h
View File

@ -31,7 +31,7 @@ version 4 is specifically detected.
#define BOOST_OS_QNX BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_QNX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(__QNX__) || defined(__QNXNTO__) \ defined(__QNX__) || defined(__QNXNTO__) \
) )
# undef BOOST_OS_QNX # undef BOOST_OS_QNX

2
include/boost/predef/os/solaris.h
View File

@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(sun) || defined(__sun) \ defined(sun) || defined(__sun) \
) )
# undef BOOST_OS_SOLARIS # undef BOOST_OS_SOLARIS

11
include/boost/predef/os/unix.h
View File

@ -28,17 +28,14 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_UNIX BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_UNIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if defined(unix) || defined(__unix) || \
defined(unix) || defined(__unix) || \ defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE)
defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) \
)
# undef BOOST_OS_UNIX # undef BOOST_OS_UNIX
# define BOOST_OS_UNIX BOOST_VERSION_NUMBER_AVAILABLE # define BOOST_OS_UNIX BOOST_VERSION_NUMBER_AVAILABLE
#endif #endif
#if BOOST_OS_UNIX #if BOOST_OS_UNIX
# define BOOST_OS_UNIX_AVAILABLE # define BOOST_OS_UNIX_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif #endif
#define BOOST_OS_UNIX_NAME "Unix Environment" #define BOOST_OS_UNIX_NAME "Unix Environment"
@ -66,8 +63,8 @@ http://www.boost.org/LICENSE_1_0.txt)
# define BOOST_OS_SVR4 BOOST_VERSION_NUMBER_AVAILABLE # define BOOST_OS_SVR4 BOOST_VERSION_NUMBER_AVAILABLE
#endif #endif
#if BOOST_ARCH_ALPHA #if BOOST_OS_SVR4
# define _AVAILABLE # define BOOST_OS_SVR4_AVAILABLE
#endif #endif
#define BOOST_OS_SVR4_NAME "SVR4 Environment" #define BOOST_OS_SVR4_NAME "SVR4 Environment"

2
include/boost/predef/os/vms.h
View File

@ -28,7 +28,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_VMS BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_VMS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(VMS) || defined(__VMS) \ defined(VMS) || defined(__VMS) \
) )
# undef BOOST_OS_VMS # undef BOOST_OS_VMS

2
include/boost/predef/os/windows.h
View File

@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
defined(_WIN32) || defined(_WIN64) || \ defined(_WIN32) || defined(_WIN64) || \
defined(__WIN32__) || defined(__TOS_WIN__) || \ defined(__WIN32__) || defined(__TOS_WIN__) || \
defined(__WINDOWS__) \ defined(__WINDOWS__) \