boost/thread
2
0
Fork 0
mirror of https://github.com/boostorg/thread.git synced 2026-01-23 06:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Thread: try to fix double definition of GetTickCount64.

Browse Source 
[SVN r83318]
This commit is contained in:
Vicente J. Botet Escriba
2013-03-05 18:57:34 +00:00
parent 9615a51123
commit abf441ee63
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/boost/thread/win32/thread_primitives.hpp
View File

@@ -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
}
}
}