forked from boostorg/predef
More stringent testing of OSX BSD like behavior. Fix BSD mis-detection
on OSX depending on include order.
This commit is contained in:
+3
-2
@@ -12,9 +12,10 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
* tests that the sys/param.h include can be included before
|
||||
* endian detection and still have it work correctly.
|
||||
*/
|
||||
#include <boost/predef/os/macos.h>
|
||||
|
||||
#if BOOST_OS_MACOS
|
||||
#if defined(__APPLE__)
|
||||
# include <sys/param.h>
|
||||
# include <boost/predef/os/bsd.h>
|
||||
# include <boost/predef/os/macos.h>
|
||||
# include <boost/predef/other/endian.h>
|
||||
#endif
|
||||
|
||||
+4
-5
@@ -9,12 +9,11 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
* OSX can masquerade as BSD when sys/param.h is previously included.
|
||||
* So we test that we only detect OSX in this combination.
|
||||
*/
|
||||
#include <boost/predef/os/macos.h>
|
||||
|
||||
#if BOOST_OS_MACOS
|
||||
#if defined(__APPLE__)
|
||||
# include <sys/param.h>
|
||||
# include <boost/predef/os/bsd.h>
|
||||
# if BOOST_OS_BSD
|
||||
# error "Both BOOST_OS_MACOS and BOOST_OS_BSD defined."
|
||||
# include <boost/predef/os/macos.h>
|
||||
# if !BOOST_OS_MACOS || BOOST_OS_BSD
|
||||
# error "BOOST_OS_MACOS not detected and/or BOOST_OS_BSD mis-detected."
|
||||
# endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user