forked from boostorg/predef
Address endian compile errors for OSX in the cases where sys/param.h was
include ahead of the predef headers. The solution was to: use the OSX machine/endian.h header, and only allow a single OS to be detected at once. Test cases added for both conditions on OSX.
This commit is contained in:
1 parent
3ecdcb44df
commit
b28bad14ea
26 files changed
+161
-40
No files matched your search
@@ -24,7 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE
|
||||
|
||||
#if defined(__bsdi__)
|
||||
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
|
||||
defined(__bsdi__) \
|
||||
)
|
||||
# ifndef BOOST_OS_BSD_AVAILABLE
|
||||
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
|
||||
# define BOOST_OS_BSD_AVAILABLE
|
||||
@@ -35,6 +37,7 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#if BOOST_OS_BSD_BSDI
|
||||
# define BOOST_OS_BSD_BSDI_AVAILABLE
|
||||
# include <boost/predef/detail/os_detected.h>
|
||||
#endif
|
||||
|
||||
#define BOOST_OS_BSD_BSDI_NAME "BSDi BSD/OS"
|
||||
|
||||
@@ -24,7 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE
|
||||
|
||||
#if defined(__DragonFly__)
|
||||
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
|
||||
defined(__DragonFly__) \
|
||||
)
|
||||
# ifndef BOOST_OS_BSD_AVAILABLE
|
||||
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
|
||||
# define BOOST_OS_BSD_AVAILABLE
|
||||
@@ -37,6 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#if BOOST_OS_BSD_DRAGONFLY
|
||||
# define BOOST_OS_BSD_DRAGONFLY_AVAILABLE
|
||||
# include <boost/predef/detail/os_detected.h>
|
||||
#endif
|
||||
|
||||
#define BOOST_OS_BSD_DRAGONFLY_NAME "DragonFly BSD"
|
||||
|
||||
@@ -26,7 +26,9 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
|
||||
defined(__FreeBSD__) \
|
||||
)
|
||||
# ifndef BOOST_OS_BSD_AVAILABLE
|
||||
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
|
||||
# define BOOST_OS_BSD_AVAILABLE
|
||||
@@ -47,6 +49,7 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#if BOOST_OS_BSD_FREE
|
||||
# define BOOST_OS_BSD_FREE_AVAILABLE
|
||||
# include <boost/predef/detail/os_detected.h>
|
||||
#endif
|
||||
|
||||
#define BOOST_OS_BSD_FREE_NAME "Free BSD"
|
||||
|
||||
@@ -31,7 +31,9 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE
|
||||
|
||||
#if defined(__NETBSD__) || defined(__NetBSD__)
|
||||
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
|
||||
defined(__NETBSD__) || defined(__NetBSD__) \
|
||||
)
|
||||
# ifndef BOOST_OS_BSD_AVAILABLE
|
||||
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
|
||||
# define BOOST_OS_BSD_AVAILABLE
|
||||
@@ -71,6 +73,7 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#if BOOST_OS_BSD_NET
|
||||
# define BOOST_OS_BSD_NET_AVAILABLE
|
||||
# include <boost/predef/detail/os_detected.h>
|
||||
#endif
|
||||
|
||||
#define BOOST_OS_BSD_NET_NAME "DragonFly BSD"
|
||||
|
||||
@@ -55,7 +55,9 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE
|
||||
|
||||
#if defined(__OpenBSD__)
|
||||
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
|
||||
defined(__OpenBSD__) \
|
||||
)
|
||||
# ifndef BOOST_OS_BSD_AVAILABLE
|
||||
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
|
||||
# define BOOST_OS_BSD_AVAILABLE
|
||||
@@ -158,6 +160,7 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#if BOOST_OS_BSD_OPEN
|
||||
# define BOOST_OS_BSD_OPEN_AVAILABLE
|
||||
# include <boost/predef/detail/os_detected.h>
|
||||
#endif
|
||||
|
||||
#define BOOST_OS_BSD_OPEN_NAME "OpenBSD"
|
||||
|
||||
Reference in new issue
Block a user