From abf441ee63ad0ae1a007ea33dcf9edef87dbbb7c Mon Sep 17 00:00:00 2001 From: "Vicente J. Botet Escriba" Date: Tue, 5 Mar 2013 18:57:34 +0000 Subject: [PATCH] Thread: try to fix double definition of GetTickCount64. [SVN r83318] --- include/boost/thread/win32/thread_primitives.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp index 752c6cda..c8497739 100644 --- a/include/boost/thread/win32/thread_primitives.hpp +++ b/include/boost/thread/win32/thread_primitives.hpp @@ -154,11 +154,9 @@ namespace boost __declspec(dllimport) unsigned long __stdcall QueueUserAPC(queue_user_apc_callback_function,void*,ulong_ptr); __declspec(dllimport) unsigned long __stdcall GetTickCount(); -#ifdef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64 +# ifdef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64 __declspec(dllimport) ticks_type __stdcall GetTickCount64(); -#else - inline ticks_type GetTickCount64() { return GetTickCount(); } -#endif +# endif # ifndef UNDER_CE __declspec(dllimport) unsigned long __stdcall GetCurrentProcessId(); __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(); @@ -175,6 +173,9 @@ namespace boost using ::ResetEvent; # endif } +# ifndef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64 + inline ticks_type GetTickCount64() { return GetTickCount(); } +# endif } } }