From b4e608fcf2397245bbb11955e5b2447dcc20e7a8 Mon Sep 17 00:00:00 2001 From: Steve Gates Date: Mon, 2 Jun 2014 12:16:56 -0700 Subject: [PATCH] Updating macro for detecting the Windows Runtime based on accepted changes adding a Boost.Predef. --- include/boost/detail/winapi/system.hpp | 2 +- include/boost/detail/winapi/time.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/detail/winapi/system.hpp b/include/boost/detail/winapi/system.hpp index c68c379..2c2d82a 100644 --- a/include/boost/detail/winapi/system.hpp +++ b/include/boost/detail/winapi/system.hpp @@ -1,7 +1,7 @@ // system.hpp --------------------------------------------------------------// // Copyright 2010 Vicente J. Botet Escriba -// Copyright (c) Microsoft Corporation +// Copyright (c) Microsoft Corporation 2014 // Distributed under the Boost Software License, Version 1.0. // See http://www.boost.org/LICENSE_1_0.txt diff --git a/include/boost/detail/winapi/time.hpp b/include/boost/detail/winapi/time.hpp index 09382a2..6a6b447 100644 --- a/include/boost/detail/winapi/time.hpp +++ b/include/boost/detail/winapi/time.hpp @@ -1,7 +1,7 @@ // time.hpp --------------------------------------------------------------// // Copyright 2010 Vicente J. Botet Escriba -// Copyright (c) Microsoft Corporation +// Copyright (c) Microsoft Corporation 2014 // Distributed under the Boost Software License, Version 1.0. // See http://www.boost.org/LICENSE_1_0.txt @@ -33,13 +33,13 @@ namespace winapi { #ifdef BOOST_HAS_GETSYSTEMTIMEASFILETIME // Windows CE does not define GetSystemTimeAsFileTime using ::GetSystemTimeAsFileTime; #endif - #ifndef BOOST_WINDOWS_RUNTIME + #if BOOST_PLAT_WINDOWS_DESKTOP using ::FileTimeToLocalFileTime; #endif using ::GetSystemTime; using ::SystemTimeToFileTime; - #ifndef BOOST_WINDOWS_RUNTIME + #if BOOST_PLAT_WINDOWS_DESKTOP using ::GetTickCount; #endif #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6 @@ -77,7 +77,7 @@ extern "C" { __declspec(dllimport) int WINAPI SystemTimeToFileTime(const SYSTEMTIME_* lpSystemTime, FILETIME_* lpFileTime); - #ifndef BOOST_WINDOWS_RUNTIME + #if BOOST_PLAT_WINDOWS_DESKTOP __declspec(dllimport) DWORD_ WINAPI GetTickCount(); #endif