From 60070347528c003e75745796d69560dafd01b2f3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 14 Oct 2013 23:00:52 -0500 Subject: [PATCH] Fix repeat def of OS_BSD when sub-BSD flavor detected. Fix some make tests that fail on non-2003 compile modes. --- include/boost/predef/os/bsd.h | 2 ++ test/make.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/boost/predef/os/bsd.h b/include/boost/predef/os/bsd.h index ec4e398..be728d7 100644 --- a/include/boost/predef/os/bsd.h +++ b/include/boost/predef/os/bsd.h @@ -48,7 +48,9 @@ of BSD. If the above variants is detected the corresponding macro is also set.] #include #include +#ifndef BOOST_OS_BSD #define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE +#endif #if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ defined(BSD) || \ diff --git a/test/make.cpp b/test/make.cpp index 9665020..8f55932 100644 --- a/test/make.cpp +++ b/test/make.cpp @@ -45,8 +45,8 @@ void test_BOOST_VERSION_NUMBER() PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRRPP(99999) == BOOST_VERSION_NUMBER(9,99,99)); PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP000(999000) == BOOST_VERSION_NUMBER(9,9,9)); PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR000(999000) == BOOST_VERSION_NUMBER(9,99,0)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900) == BOOST_VERSION_NUMBER(21,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900L) == BOOST_VERSION_NUMBER(99,99,99)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900u) == BOOST_VERSION_NUMBER(21,99,99)); + /* PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900ull) == BOOST_VERSION_NUMBER(99,99,99)); */ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PP00(999909900) == BOOST_VERSION_NUMBER(99,99,99)); PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VV00(9900) == BOOST_VERSION_NUMBER(99,00,00)); PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PPPP(999909999) == BOOST_VERSION_NUMBER(99,99,9999));