diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-04-06 12:21:14 +0900 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-04-06 12:21:14 +0900 |
| commit | abea280dd3df0c0f6d67a930eb2ffe5b73255fa9 (patch) | |
| tree | 976c97df968520e73fd3f869490cf51c0c5100d1 | |
| parent | 151f4b63f776c984f8639b8a6bda58fa07bff163 (diff) | |
| parent | aaaf9e2e6d81a2f300d724f1daab3d7aa1f798bf (diff) | |
| download | monzero-core-abea280dd3df0c0f6d67a930eb2ffe5b73255fa9.tar.gz monzero-core-abea280dd3df0c0f6d67a930eb2ffe5b73255fa9.tar.xz monzero-core-abea280dd3df0c0f6d67a930eb2ffe5b73255fa9.zip | |
Merge pull request #799
aaaf9e2 Fix get_tick_count() on Windows (Howard Chu)
| -rw-r--r-- | contrib/epee/include/misc_os_dependent.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/contrib/epee/include/misc_os_dependent.h b/contrib/epee/include/misc_os_dependent.h index 2abca0446..806d3e83e 100644 --- a/contrib/epee/include/misc_os_dependent.h +++ b/contrib/epee/include/misc_os_dependent.h @@ -53,11 +53,13 @@ namespace misc_utils #if defined(_MSC_VER) return ::GetTickCount64(); #elif defined(WIN32) -# if defined(WIN64) - return GetTickCount64(); -# else - return GetTickCount(); -# endif + static LARGE_INTEGER pcfreq = {0}; + LARGE_INTEGER ticks; + if (!pcfreq.QuadPart) + QueryPerformanceFrequency(&pcfreq); + QueryPerformanceCounter(&ticks); + ticks.QuadPart *= 1000; /* we want msec */ + return ticks.QuadPart / pcfreq.QuadPart; #elif defined(__MACH__) clock_serv_t cclock; mach_timespec_t mts; |