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/socks.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/socks.c')
-rw-r--r-- | lib/socks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/socks.c b/lib/socks.c index 742d41156..3b28798e5 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -57,7 +57,7 @@ int Curl_blockread_all(struct connectdata *conn, /* connection data */ ssize_t nread; ssize_t allread = 0; int result; - long timeleft; + time_t timeleft; *n = 0; for(;;) { timeleft = Curl_timeleft(conn->data, NULL, TRUE); @@ -376,7 +376,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, CURLcode code; curl_socket_t sock = conn->sock[sockindex]; struct Curl_easy *data = conn->data; - long timeout; + time_t timeout; bool socks5_resolve_local = (conn->proxytype == CURLPROXY_SOCKS5)?TRUE:FALSE; const size_t hostname_len = strlen(hostname); ssize_t len = 0; |