diff DEPENDENCIES/generic/include/boost/detail/winapi/time.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/detail/winapi/time.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/detail/winapi/time.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -1,6 +1,7 @@
 //  time.hpp  --------------------------------------------------------------//
 
 //  Copyright 2010 Vicente J. Botet Escriba
+//  Copyright (c) Microsoft Corporation 2014
 
 //  Distributed under the Boost Software License, Version 1.0.
 //  See http://www.boost.org/LICENSE_1_0.txt
@@ -10,6 +11,7 @@
 #define BOOST_DETAIL_WINAPI_TIME_HPP
 
 #include <boost/detail/winapi/basic_types.hpp>
+#include <boost/predef.h>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -18,7 +20,9 @@
 namespace boost {
 namespace detail {
 namespace winapi {
+
 #if defined( BOOST_USE_WINDOWS_H )
+
     typedef FILETIME FILETIME_;
     typedef PFILETIME PFILETIME_;
     typedef LPFILETIME LPFILETIME_;
@@ -29,12 +33,21 @@
     #ifdef BOOST_HAS_GETSYSTEMTIMEASFILETIME  // Windows CE does not define GetSystemTimeAsFileTime
     using ::GetSystemTimeAsFileTime;
     #endif
+    #if BOOST_PLAT_WINDOWS_DESKTOP
     using ::FileTimeToLocalFileTime;
+    #endif
     using ::GetSystemTime;
     using ::SystemTimeToFileTime;
+    
+    #if BOOST_PLAT_WINDOWS_DESKTOP
     using ::GetTickCount;
+    #endif
+    #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
+    using ::GetTickCount64;
+    #endif
 
 #else
+
 extern "C" {
     typedef struct _FILETIME {
         DWORD_ dwLowDateTime;
@@ -64,9 +77,16 @@
     __declspec(dllimport) int WINAPI
         SystemTimeToFileTime(const SYSTEMTIME_* lpSystemTime,
                 FILETIME_* lpFileTime);
+    #if BOOST_PLAT_WINDOWS_DESKTOP
     __declspec(dllimport) DWORD_ WINAPI
         GetTickCount();
+    #endif
+    #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
+    __declspec(dllimport) ULONGLONG_ WINAPI
+        GetTickCount64();
+    #endif
 }
+
 #endif
 
 #ifndef BOOST_HAS_GETSYSTEMTIMEASFILETIME