tvnow: silence conversion warnings

MinGW-w64 defaults to targeting Windows 7 now, so GetTickCount64 is
used and the milliseconds are represented as unsigned long long,
leading to a compiler warning when implicitly converting them to long.

diff --git a/src/tool_util.c b/src/tool_util.c
index 1a5b773e2aef52c3b3c74401aeed783159c94eec..9990a463464114e6d012ba1c577b7fd2c5134d77 100644 (file)
--- a/src/tool_util.c
+++ b/src/tool_util.c
@@ -47,7 +47,7 @@ struct timeval tvnow(void)
   DWORD milliseconds = GetTickCount();
 #endif
   now.tv_sec = (long)(milliseconds / 1000);
-  now.tv_usec = (milliseconds % 1000) * 1000;
+  now.tv_usec = (long)((milliseconds % 1000) * 1000);
   return now;
 }
 

diff --git a/tests/server/util.c b/tests/server/util.c
index df1e35da09b6aa2f76e055ad241bedd4b26f1b3a..c3935f58aecc89978520f0179c420f844055c66e 100644 (file)
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -422,7 +422,7 @@ static struct timeval tvnow(void)
   DWORD milliseconds = GetTickCount();
 #endif
   now.tv_sec = (long)(milliseconds / 1000);
-  now.tv_usec = (milliseconds % 1000) * 1000;
+  now.tv_usec = (long)((milliseconds % 1000) * 1000);
   return now;
 }