diff options
author | Marcel Raad <raad@teamviewer.com> | 2016-11-18 10:07:08 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2016-11-18 10:11:55 +0100 |
commit | 21aa32d30dbf319f2d336e0cb68d3a3235869fbb (patch) | |
tree | f8dc171c75e56b4b96254c87c60a37cd2f34273f /lib/pingpong.c | |
parent | 0b8d682f81ee9acb763dd4c9ad805fe08d1227c0 (diff) | |
download | curl-21aa32d30dbf319f2d336e0cb68d3a3235869fbb.tar.gz |
lib: fix compiler warnings after de4de4e3c7c
Visual C++ now complains about implicitly casting time_t (64-bit) to
long (32-bit). Fix this by changing some variables from long to time_t,
or explicitly casting to long where the public interface would be
affected.
Closes #1131
Diffstat (limited to 'lib/pingpong.c')
-rw-r--r-- | lib/pingpong.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/pingpong.c b/lib/pingpong.c index bf2c8fd0a..ded17ef40 100644 --- a/lib/pingpong.c +++ b/lib/pingpong.c @@ -44,12 +44,12 @@ /* Returns timeout in ms. 0 or negative number means the timeout has already triggered */ -long Curl_pp_state_timeout(struct pingpong *pp) +time_t Curl_pp_state_timeout(struct pingpong *pp) { struct connectdata *conn = pp->conn; struct Curl_easy *data=conn->data; - long timeout_ms; /* in milliseconds */ - long timeout2_ms; /* in milliseconds */ + time_t timeout_ms; /* in milliseconds */ + time_t timeout2_ms; /* in milliseconds */ long response_time= (data->set.server_response_timeout)? data->set.server_response_timeout: pp->response_time; @@ -83,8 +83,8 @@ CURLcode Curl_pp_statemach(struct pingpong *pp, bool block) struct connectdata *conn = pp->conn; curl_socket_t sock = conn->sock[FIRSTSOCKET]; int rc; - long interval_ms; - long timeout_ms = Curl_pp_state_timeout(pp); + time_t interval_ms; + time_t timeout_ms = Curl_pp_state_timeout(pp); struct Curl_easy *data=conn->data; CURLcode result = CURLE_OK; |