From a458efd7a2aba018d8a8f75834ef38ba3cd149b8 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 4 Jul 2013 19:08:12 +0200 Subject: [PATCH] fix timer for windows --- src/timer.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/timer.cpp b/src/timer.cpp index 85e9f2497b..ff3fbb4158 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -15,12 +15,14 @@ #include "timer.h" #include "memory.h" -// #define LMP_CLOCK_GETTIME 1 +#ifdef _WIN32 +#include +#else #ifdef LMP_CLOCK_GETTIME #include #endif -#ifndef _WIN32 + #include #include #endif @@ -49,11 +51,11 @@ static double get_cpu_time() FILETIME ct,et,kt,ut; double rv = 0.0; if (GetProcessTimes(GetCurrentProcess(),&ct,&et,&kt,&ut)) { - rv = (double) dwLowDateTime * 0.0000001; - rv += (double) dwHighDateTime *429.4967296; + uint64_t ct = &ut; + rv = ct * 0.0000001; } return rv; -); +}; #endif /* _WIN32 */ #endif }