diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-18 14:16:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-05-18 14:16:50 (GMT) |
| commit | 3e913b819d8d8118d5e8dc3b7289f622e9ca92e5 (patch) | |
| tree | 82c19f5ec814c84b986e54e3fc6fa0a83622fd81 /Utilities/cmcurl/lib/timeval.c | |
| parent | f3c73b878c594d40119e480ca1074e733d7ba1ce (diff) | |
| parent | d431136e029c652f5913bcebeaab3b9236b114c4 (diff) | |
| download | CMake-3e913b819d8d8118d5e8dc3b7289f622e9ca92e5.zip CMake-3e913b819d8d8118d5e8dc3b7289f622e9ca92e5.tar.gz CMake-3e913b819d8d8118d5e8dc3b7289f622e9ca92e5.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2018-05-15 (cb013830)
Diffstat (limited to 'Utilities/cmcurl/lib/timeval.c')
| -rw-r--r-- | Utilities/cmcurl/lib/timeval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/cmcurl/lib/timeval.c b/Utilities/cmcurl/lib/timeval.c index 66f923a..f4bf835 100644 --- a/Utilities/cmcurl/lib/timeval.c +++ b/Utilities/cmcurl/lib/timeval.c @@ -110,7 +110,7 @@ struct curltime Curl_now(void) usecs /= 1000; cnow.tv_sec = usecs / 1000000; - cnow.tv_usec = usecs % 1000000; + cnow.tv_usec = (int)(usecs % 1000000); return cnow; } @@ -128,7 +128,7 @@ struct curltime Curl_now(void) struct curltime ret; (void)gettimeofday(&now, NULL); ret.tv_sec = now.tv_sec; - ret.tv_usec = now.tv_usec; + ret.tv_usec = (int)now.tv_usec; return ret; } |