Merge pull request #799
aaaf9e2
Fix get_tick_count() on Windows (Howard Chu)
This commit is contained in:
commit
abea280dd3
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue