rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-27 05:13:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #799

Browse Source 
aaaf9e2 Fix get_tick_count() on Windows (Howard Chu)
This commit is contained in:
Riccardo Spagni 2016-04-06 12:21:14 +09:00
commit abea280dd3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,11 +53,13 @@ namespace misc_utils
#if defined(_MSC_VER) #if defined(_MSC_VER)
return ::GetTickCount64(); return ::GetTickCount64();
#elif defined(WIN32) #elif defined(WIN32)
# if defined(WIN64) static LARGE_INTEGER pcfreq = {0};
return GetTickCount64(); LARGE_INTEGER ticks;
# else if (!pcfreq.QuadPart)
return GetTickCount(); QueryPerformanceFrequency(&pcfreq);
# endif QueryPerformanceCounter(&ticks);
ticks.QuadPart *= 1000; /* we want msec */
return ticks.QuadPart / pcfreq.QuadPart;
#elif defined(__MACH__) #elif defined(__MACH__)
clock_serv_t cclock; clock_serv_t cclock;
mach_timespec_t mts; mach_timespec_t mts;