mirror of
https://github.com/boostorg/detail.git
synced 2025-08-03 22:34:27 +02:00
Updating macro for detecting the Windows Runtime based on accepted changes adding a Boost.Predef.
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
// system.hpp --------------------------------------------------------------//
|
// system.hpp --------------------------------------------------------------//
|
||||||
|
|
||||||
// Copyright 2010 Vicente J. Botet Escriba
|
// Copyright 2010 Vicente J. Botet Escriba
|
||||||
// Copyright (c) Microsoft Corporation
|
// Copyright (c) Microsoft Corporation 2014
|
||||||
|
|
||||||
// Distributed under the Boost Software License, Version 1.0.
|
// Distributed under the Boost Software License, Version 1.0.
|
||||||
// See http://www.boost.org/LICENSE_1_0.txt
|
// See http://www.boost.org/LICENSE_1_0.txt
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
// time.hpp --------------------------------------------------------------//
|
// time.hpp --------------------------------------------------------------//
|
||||||
|
|
||||||
// Copyright 2010 Vicente J. Botet Escriba
|
// Copyright 2010 Vicente J. Botet Escriba
|
||||||
// Copyright (c) Microsoft Corporation
|
// Copyright (c) Microsoft Corporation 2014
|
||||||
|
|
||||||
// Distributed under the Boost Software License, Version 1.0.
|
// Distributed under the Boost Software License, Version 1.0.
|
||||||
// See http://www.boost.org/LICENSE_1_0.txt
|
// 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
|
#ifdef BOOST_HAS_GETSYSTEMTIMEASFILETIME // Windows CE does not define GetSystemTimeAsFileTime
|
||||||
using ::GetSystemTimeAsFileTime;
|
using ::GetSystemTimeAsFileTime;
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOOST_WINDOWS_RUNTIME
|
#if BOOST_PLAT_WINDOWS_DESKTOP
|
||||||
using ::FileTimeToLocalFileTime;
|
using ::FileTimeToLocalFileTime;
|
||||||
#endif
|
#endif
|
||||||
using ::GetSystemTime;
|
using ::GetSystemTime;
|
||||||
using ::SystemTimeToFileTime;
|
using ::SystemTimeToFileTime;
|
||||||
|
|
||||||
#ifndef BOOST_WINDOWS_RUNTIME
|
#if BOOST_PLAT_WINDOWS_DESKTOP
|
||||||
using ::GetTickCount;
|
using ::GetTickCount;
|
||||||
#endif
|
#endif
|
||||||
#if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
|
#if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
|
||||||
@@ -77,7 +77,7 @@ extern "C" {
|
|||||||
__declspec(dllimport) int WINAPI
|
__declspec(dllimport) int WINAPI
|
||||||
SystemTimeToFileTime(const SYSTEMTIME_* lpSystemTime,
|
SystemTimeToFileTime(const SYSTEMTIME_* lpSystemTime,
|
||||||
FILETIME_* lpFileTime);
|
FILETIME_* lpFileTime);
|
||||||
#ifndef BOOST_WINDOWS_RUNTIME
|
#if BOOST_PLAT_WINDOWS_DESKTOP
|
||||||
__declspec(dllimport) DWORD_ WINAPI
|
__declspec(dllimport) DWORD_ WINAPI
|
||||||
GetTickCount();
|
GetTickCount();
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user