From c092d007702cab412003474d213ccaa33cd489b4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 29 Feb 2020 08:06:33 -0600 Subject: [PATCH] Fix UWP detection error on WinCE. The ntverp.h header is not avilable on Win32 WinCE, just like MinGW32. Fixes #102 (merge from hash-predef) --- doc/history.adoc | 2 ++ include/boost/predef/platform/windows_uwp.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/history.adoc b/doc/history.adoc index e045b57..9acf446 100644 --- a/doc/history.adoc +++ b/doc/history.adoc @@ -12,6 +12,8 @@ http://www.boost.org/LICENSE_1_0.txt) * Add `BOOST_ARCH_RISCV`. (from Andreas Schwab) * Add RISC-V endian detection. (from Thomas Petazzoni) * Convert documentation to AsciiDoctor format. +* Document correct versions for C++ standard. +* Fix compile error from not available header when building in WinCE. == 1.10 diff --git a/include/boost/predef/platform/windows_uwp.h b/include/boost/predef/platform/windows_uwp.h index 5bd2e18..325f3b6 100644 --- a/include/boost/predef/platform/windows_uwp.h +++ b/include/boost/predef/platform/windows_uwp.h @@ -32,8 +32,8 @@ UWP development. #define BOOST_PLAT_WINDOWS_SDK_VERSION BOOST_VERSION_NUMBER_NOT_AVAILABLE #if BOOST_OS_WINDOWS -// MinGW (32-bit) has no ntverp.h header -#if !defined(__MINGW32__) +// MinGW (32-bit), and WinCE, don't have a ntverp.h header +#if !defined(__MINGW32__) && !defined(_WIN32_WCE) # include # undef BOOST_PLAT_WINDOWS_SDK_VERSION # define BOOST_PLAT_WINDOWS_SDK_VERSION BOOST_VERSION_NUMBER(0, 0, VER_PRODUCTBUILD)