diff options
author | Daniel Stenberg <daniel@haxx.se> | 2019-07-31 15:30:31 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2019-08-01 07:43:24 +0200 |
commit | b1616dad8f088d873d88f88b4d884335a4ca285f (patch) | |
tree | 31637b618958b051693d23591042468243fe0b35 /lib/asyn-thread.c | |
parent | 7c14dde9240a6a113358fe551f378328a41477e2 (diff) |
timediff: make it 64 bit (if possible) even with 32 bit time_t
... to make it hold microseconds too.
Fixes #4165
Closes #4168
Diffstat (limited to 'lib/asyn-thread.c')
-rwxr-xr-x | lib/asyn-thread.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c index dcc2e8a9d..222e78d98 100755 --- a/lib/asyn-thread.c +++ b/lib/asyn-thread.c @@ -603,8 +603,9 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn, } else { /* poll for name lookup done with exponential backoff up to 250ms */ - timediff_t elapsed = Curl_timediff(Curl_now(), - data->progress.t_startsingle); + /* should be fine even if this converts to 32 bit */ + time_t elapsed = (time_t)Curl_timediff(Curl_now(), + data->progress.t_startsingle); if(elapsed < 0) elapsed = 0; @@ -651,7 +652,7 @@ int Curl_resolver_getsock(struct connectdata *conn, if(ms < 3) milli = 0; else if(ms <= 50) - milli = ms/3; + milli = (time_t)ms/3; else if(ms <= 250) milli = 50; else |