diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-07-28 15:49:36 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-07-28 15:51:25 +0200 |
| commit | 4dee50b9c80f9b18d2eb9a1c20bd879abb342302 (patch) | |
| tree | 7a9c5ddd299e23ad27c7efa6a8759ae3122f31c9 /lib/asyn-ares.c | |
| parent | 7551e55d6614cddb039602e08f3d7aa302299617 (diff) | |
| download | curl-4dee50b9c80f9b18d2eb9a1c20bd879abb342302.tar.gz | |
timeval: struct curltime is a struct timeval replacement
... to make all libcurl internals able to use the same data types for
the struct members. The timeval struct differs subtly on several
platforms so it makes it cumbersome to use everywhere.
Ref: #1652
Closes #1693
Diffstat (limited to 'lib/asyn-ares.c')
| -rw-r--r-- | lib/asyn-ares.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index 11a914f82..9b6515cda 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -355,7 +355,7 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn, CURLcode result = CURLE_OK; struct Curl_easy *data = conn->data; long timeout; - struct timeval now = Curl_tvnow(); + struct curltime now = Curl_tvnow(); struct Curl_dns_entry *temp_entry; if(entry) @@ -400,7 +400,7 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn, if(Curl_pgrsUpdate(conn)) result = CURLE_ABORTED_BY_CALLBACK; else { - struct timeval now2 = Curl_tvnow(); + struct curltime now2 = Curl_tvnow(); time_t timediff = Curl_tvdiff(now2, now); /* spent time */ if(timediff <= 0) timeout -= 1; /* always deduct at least 1 */ |