2 files changed, 3 insertions, 12 deletions
diff --git a/src/platform/windows/win_clock.c b/src/platform/windows/win_clock.c
index 3309be24..bdb2f550 100644
--- a/src/platform/windows/win_clock.c
+++ b/src/platform/windows/win_clock.c
@@ -14,17 +14,8 @@
 nni_time
 nni_plat_clock(void)
 {
-	LARGE_INTEGER freq;
-	LARGE_INTEGER count;
-	double rate;
-
-	QueryPerformanceFrequency(&freq);
-	QueryPerformanceCounter(&count);
-
-	// convert to ticks per us
-	rate = (double) freq.QuadPart / 1000000.0;
-
-	return ((nni_time) (count.QuadPart / rate));
+	// We are limited by the system clock, but that is ok.
+	return (GetTickCount64()*1000);
 }
 
 
diff --git a/src/platform/windows/win_thread.c b/src/platform/windows/win_thread.c
index 631883fc..4d47f18e 100644
--- a/src/platform/windows/win_thread.c
+++ b/src/platform/windows/win_thread.c
@@ -95,7 +95,7 @@ nni_plat_cv_until(nni_plat_cv *cv, nni_time until)
 		msec = 0;
 	} else {
 		// times are in usec, but win32 wants millis
-		msec = (until - now)/1000;
+		msec = ((until - now) + 999)/1000;
 	}
 
 	ok = SleepConditionVariableCS(&cv->cv, cv->cs, msec);