From 7e31244f0141625cc15a31152e05fbf68eb4d6fb Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 14 Jan 2019 00:21:46 -0600 Subject: [PATCH] Fix bad include of sub-BSD os headers from main BSD header. Fixes #85 --- doc/history.qbk | 1 + include/boost/predef/os/bsd.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/history.qbk b/doc/history.qbk index c887eaa..766d235 100644 --- a/doc/history.qbk +++ b/doc/history.qbk @@ -9,6 +9,7 @@ http://www.boost.org/LICENSE_1_0.txt) [heading 1.10] +* Fix bad include of sub-BSD os headers from main BSD header. * Fix use of deprecated `TARGET_IPHONE_SIMULATOR` instead of newer `TARGET_OS_SIMULATOR`. * Add `BOOST_PLAT_ANDROID` to resolve conflict between Linux and Android diff --git a/include/boost/predef/os/bsd.h b/include/boost/predef/os/bsd.h index fad9aed..81d2c08 100644 --- a/include/boost/predef/os/bsd.h +++ b/include/boost/predef/os/bsd.h @@ -89,7 +89,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.] #define BOOST_OS_BSD_NAME "BSD" -#else +#endif #include #include @@ -97,7 +97,5 @@ of BSD. If the above variants is detected the corresponding macro is also set.] #include #include -#endif - #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,BOOST_OS_BSD_NAME)