feedc0de/boost_predef
1
0
Fork 0
forked from boostorg/predef
Code Pull Requests Activity

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.

Browse Source 
[SVN r86167]
This commit is contained in:
Rene Rivera
2013-10-05 21:50:45 +00:00
parent 8931511834
commit d002626ef7
26 changed files with 161 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/predef/detail/os_detected.h Normal file
View File

@ -0,0 +1,10 @@
/*
Copyright Redshift Software, Inc. 2013
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
*/
#ifndef BOOST_PREDEF_DETAIL_OS_DETECTED
#define BOOST_PREDEF_DETAIL_OS_DETECTED 1
#endif

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

@ -32,7 +32,9 @@ Version number available as major, minor, and patch.
#define BOOST_OS_AIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(_AIX) || defined(__TOS_AIX__)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(_AIX) || defined(__TOS_AIX__) \
)
# undef BOOST_OS_AIX
# if !defined(BOOST_OS_AIX) && defined(_AIX43)
# define BOOST_OS_AIX BOOST_VERSION_NUMBER(4,3,0)
@ -53,6 +55,7 @@ Version number available as major, minor, and patch.
#if BOOST_OS_AIX
# define BOOST_OS_AIX_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_AIX_NAME "IBM AIX"

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

@ -26,13 +26,16 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(AMIGA) || defined(__amigaos__)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(AMIGA) || defined(__amigaos__) \
)
# undef BOOST_OS_AMIGAOS
# define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_AMIGAOS
# define BOOST_OS_AMIGAOS_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_AMIGAOS_NAME "AmigaOS"

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

@ -25,13 +25,16 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(__ANDROID__)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(__ANDROID__) \
)
# undef BOOST_OS_ANDROID
# define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_ANDROID
# define BOOST_OS_ANDROID_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_ANDROID_NAME "Android"

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

@ -25,13 +25,16 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_BEOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(__BEOS__)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(__BEOS__) \
)
# undef BOOST_OS_BEOS
# define BOOST_OS_BEOS BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_BEOS
# define BOOST_OS_BEOS_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_BEOS_NAME "BeOS"

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

@ -42,20 +42,28 @@ of BSD. If the above variants is detected the corresponding macro is also set.]
]
*/
#include <boost/predef/os/bsd/bsdi.h>
#include <boost/predef/os/bsd/dragonfly.h>
#include <boost/predef/os/bsd/free.h>
#include <boost/predef/os/bsd/open.h>
#include <boost/predef/os/bsd/net.h>
#define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(BSD) || \
defined(_SYSTYPE_BSD)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(BSD) || \
defined(_SYSTYPE_BSD) \
)
# undef BOOST_OS_BSD
# include <sys/param.h>
# if !defined(BOOST_OS_BSD) && defined(BSD4_2)
# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,2,0)
# 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(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)
# if !defined(BOOST_OS_BSD) && defined(BSD4_2)
# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,2,0)
# endif
# if !defined(BOOST_OS_BSD) && defined(BSD)
# define BOOST_OS_BSD BOOST_PREDEF_MAKE_10_VVRR(BSD)
@ -67,6 +75,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.]
#if BOOST_OS_BSD
# define BOOST_OS_BSD_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_BSD_NAME "BSD"
@ -74,10 +83,4 @@ of BSD. If the above variants is detected the corresponding macro is also set.]
#include <boost/predef/detail/test.h>
BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,BOOST_OS_BSD_NAME)
#include <boost/predef/os/bsd/bsdi.h>
#include <boost/predef/os/bsd/dragonfly.h>
#include <boost/predef/os/bsd/free.h>
#include <boost/predef/os/bsd/open.h>
#include <boost/predef/os/bsd/net.h>
#endif

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

@ -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"

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

@ -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"

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

@ -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"

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

@ -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"

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

@ -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"

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

@ -25,13 +25,16 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(__CYGWIN__)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(__CYGWIN__) \
)
# undef BOOST_OS_CYGWIN
# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_CYGWIN
# define BOOST_OS_CYGWIN_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_CYGWIN_NAME "Cygwin"

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

@ -27,13 +27,16 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_HPUX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(hpux) || defined(_hpux) || defined(__hpux)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(hpux) || defined(_hpux) || defined(__hpux) \
)
# undef BOOST_OS_HPUX
# define BOOST_OS_HPUX BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_HPUX
# define BOOST_OS_HPUX_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_HPUX_NAME "HP-UX"

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

@ -26,13 +26,16 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_IRIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(sgi) || defined(__sgi)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(sgi) || defined(__sgi) \
)
# undef BOOST_OS_IRIX
# define BOOST_OS_IRIX BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_IRIX
# define BOOST_OS_IRIX_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_IRIX_NAME "IRIX"

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

@ -26,13 +26,16 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_LINUX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(linux) || defined(__linux)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(linux) || defined(__linux) \
)
# undef BOOST_OS_LINUX
# define BOOST_OS_LINUX BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_LINUX
# define BOOST_OS_LINUX_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_LINUX_NAME "Linux"

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

@ -31,8 +31,10 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(macintosh) || defined(Macintosh) || \
(defined(__APPLE__) && defined(__MACH__))
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(macintosh) || defined(Macintosh) || \
(defined(__APPLE__) && defined(__MACH__)) \
)
# undef BOOST_OS_MACOS
# if !defined(BOOST_OS_MACOS) && defined(__APPLE__) && defined(__MACH__)
# define BOOST_OS_MACOS BOOST_VERSION_NUMBER(10,0,0)
@ -44,6 +46,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#if BOOST_OS_MACOS
# define BOOST_OS_MACOS_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_MACOS_NAME "Mac OS"

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

@ -25,13 +25,16 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_OS400 BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(__OS400__)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(__OS400__) \
)
# undef BOOST_OS_OS400
# define BOOST_OS_OS400 BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_OS400
# define BOOST_OS_OS400_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_OS400_NAME "IBM OS/400"

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

@ -31,7 +31,9 @@ version 4 is specifically detected.
#define BOOST_OS_QNX BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(__QNX__) || defined(__QNXNTO__)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(__QNX__) || defined(__QNXNTO__) \
)
# undef BOOST_OS_QNX
# if !defined(BOOST_OS_QNX) && defined(_NTO_VERSION)
# define BOOST_OS_QNX BOOST_PREDEF_MAKE_10_VVRR(_NTO_VERSION)
@ -46,6 +48,7 @@ version 4 is specifically detected.
#if BOOST_OS_QNX
# define BOOST_OS_QNX_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_QNX_NAME "QNX"

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

@ -26,13 +26,16 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(sun) || defined(__sun)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(sun) || defined(__sun) \
)
# undef BOOST_OS_SOLARIS
# define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_SOLARIS
# define BOOST_OS_SOLARIS_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_SOLARIS_NAME "Solaris"

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

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

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

@ -28,7 +28,9 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_VMS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(VMS) || defined(__VMS)
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(VMS) || defined(__VMS) \
)
# undef BOOST_OS_VMS
# if defined(__VMS_VER)
# define BOOST_OS_VMS BOOST_PREDEF_MAKE_10_VVRR00PP00(__VMS_VER)
@ -39,6 +41,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#if BOOST_OS_VMS
# define BOOST_OS_VMS_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_VMS_NAME "VMS"

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

@ -29,15 +29,18 @@ http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER_NOT_AVAILABLE
#if defined(_WIN32) || defined(_WIN64) || \
#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
defined(_WIN32) || defined(_WIN64) || \
defined(__WIN32__) || defined(__TOS_WIN__) || \
defined(__WINDOWS__)
defined(__WINDOWS__) \
)
# undef BOOST_OS_WINDOWS
# define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_WINDOWS
# define BOOST_OS_WINDOWS_AVAILABLE
# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_WINDOWS_NAME "Microsoft Windows"

16
include/boost/predef/other/endian.h
View File

@ -11,6 +11,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#include <boost/predef/version_number.h>
#include <boost/predef/make.h>
#include <boost/predef/library/c/gnu.h>
#include <boost/predef/os/macos.h>
#include <boost/predef/os/bsd.h>
/*`
@ -48,17 +49,22 @@ information and acquired knowledge:
#define BOOST_ENDIAN_LITTLE_WORD BOOST_VERSION_NUMBER_NOT_AVAILABLE
/* GNU libc provides a header defining __BYTE_ORDER, or _BYTE_ORDER.
* And some OSs provide some for of endian header also.
*/
#if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \
!BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD
# if BOOST_LIB_C_GNU
# include <endian.h>
# else
# if BOOST_OS_BSD
# if BOOST_OS_BSD_OPEN
# include <machine/endian.h>
# else
# include <sys/endian.h>
# if BOOST_OS_MACOS
# include <machine/endian.h>
# else
# if BOOST_OS_BSD
# if BOOST_OS_BSD_OPEN
# include <machine/endian.h>
# else
# include <sys/endian.h>
# endif
# endif
# endif
# endif

2
test/build.jam
View File

@ -43,4 +43,6 @@ test-suite predef :
[ run info_as_objc.m : : : <test-info>always_show_run_output ]
[ run version.cpp ]
[ run make.cpp ]
[ compile macos_endian.c ]
[ compile macos_vs_bsd.c ]
;

20
test/macos_endian.c Normal file
View File

@ -0,0 +1,20 @@
/*
Copyright Redshift Software Inc. 2013
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
*/
/*
* OSX can define the BSD symbols if sys/param.h is included
* before detection. This causes the endian detection to misfire
* as both MACOS and BSD are "detected" (currently). This just
* 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
# include <sys/param.h>
# include <boost/predef/other/endian.h>
#endif

20
test/macos_vs_bsd.c Normal file
View File

@ -0,0 +1,20 @@
/*
Copyright Redshift Software Inc. 2013
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
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
# include <sys/param.h>
# include <boost/predef/os/bsd.h>
# if BOOST_OS_BSD
# error "Both BOOST_OS_MACOS and BOOST_OS_BSD defined."
# endif
#endif