From: Bruce Cran <bruce@cran.org.uk>
Date: Thu, 16 Aug 2012 06:49:41 +0000 (+0200)
Subject: fix 32-bit Windows fio (overflow in getusage and gettimeofday)
X-Git-Tag: fio-2.0.9~5
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=83ae8ca2f53fe80314de9e718c8348047418af70

fix 32-bit Windows fio (overflow in getusage and gettimeofday)

Fix overflow in getrusage and gettimeofday for 32-bit versions of fio
on Windows.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/os/windows/posix.c b/os/windows/posix.c
index 27260ce6..7bd8ea60 100755
--- a/os/windows/posix.c
+++ b/os/windows/posix.c
@@ -99,7 +99,7 @@ int gettimeofday(struct timeval *restrict tp, void *restrict tzp)
 {
 	FILETIME fileTime;
 	unsigned long long unix_time, windows_time;
-	const time_t MILLISECONDS_BETWEEN_1601_AND_1970 = 11644473600000;
+	const unsigned long long MILLISECONDS_BETWEEN_1601_AND_1970 = 11644473600000;
 
 	/* Ignore the timezone parameter */
 	(void)tzp;
@@ -462,7 +462,7 @@ int nice(int incr)
 
 int getrusage(int who, struct rusage *r_usage)
 {
-	const time_t SECONDS_BETWEEN_1601_AND_1970 = 11644473600;
+	const unsigned long long SECONDS_BETWEEN_1601_AND_1970 = 11644473600;
 	FILETIME cTime, eTime, kTime, uTime;
 	time_t time;