aboutsummaryrefslogtreecommitdiff
path: root/tests/server
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2019-01-01 18:03:11 +0100
committerMarcel Raad <Marcel.Raad@teamviewer.com>2019-01-01 18:04:24 +0100
commit46c89348b973b1088a4310e740def9859ef05408 (patch)
treee7f06a76ee404e9487588b902bcba9bb9aac2262 /tests/server
parent01ba09e25a552be8436dc788bac969c0cb046711 (diff)
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.
Diffstat (limited to 'tests/server')
-rw-r--r--tests/server/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/server/util.c b/tests/server/util.c
index df1e35da0..c3935f58a 100644
--- 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;
}