aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-02-18 13:40:13 +0100
committerDaniel Stenberg <daniel@haxx.se>2013-02-18 13:40:13 +0100
commit52b5eadf3c01b4b168f47d4a988ba3fde02d13c2 (patch)
treed6a476127d8d956f4eb633711901a8b002f5f390
parent06e6fd1aa7c3f22749a07ed1f15f925aa8a1278b (diff)
Curl_resolver_is_resolved: fix compiler warning
conversion to 'int' from 'long int' may alter its value
-rw-r--r--lib/asyn-thread.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
index 7a8294ddf..bdabfd5bf 100644
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -170,7 +170,7 @@ struct thread_sync_data {
struct thread_data {
curl_thread_t thread_hnd;
unsigned int poll_interval;
- int interval_end;
+ long interval_end;
struct thread_sync_data tsd;
};
@@ -528,7 +528,7 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn,
}
else {
/* poll for name lookup done with exponential backoff up to 250ms */
- int elapsed = Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle);
+ long elapsed = Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle);
if(elapsed < 0)
elapsed = 0;