Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

WIN32 thread_id is OS-dependent not compiler-dependent

Browse Source
This commit is contained in:
Howard Chu 2016-03-11 14:11:01 +00:00
parent 87d39f39b3
commit 52056dcfc4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/epee/include/misc_os_dependent.h
View File

@ -52,6 +52,12 @@ namespace misc_utils
{ {
#if defined(_MSC_VER) #if defined(_MSC_VER)
return ::GetTickCount64(); return ::GetTickCount64();
#elif defined(WIN32)
# if defined(WIN64)
return GetTickCount64();
# else
return GetTickCount();
# endif
#elif defined(__MACH__) #elif defined(__MACH__)
clock_serv_t cclock; clock_serv_t cclock;
mach_timespec_t mts; mach_timespec_t mts;
@ -98,7 +104,7 @@ namespace misc_utils
inline std::string get_thread_string_id() inline std::string get_thread_string_id()
{ {
#if defined(_MSC_VER) #if defined(_WIN32)
return boost::lexical_cast<std::string>(GetCurrentThreadId()); return boost::lexical_cast<std::string>(GetCurrentThreadId());
#elif defined(__GNUC__) #elif defined(__GNUC__)
return boost::lexical_cast<std::string>(pthread_self()); return boost::lexical_cast<std::string>(pthread_self());