summaryrefslogtreecommitdiff
path: root/lib/connect.h
diff options
context:
space:
mode:
authorMarcel Raad <raad@teamviewer.com>2016-11-18 10:07:08 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-11-18 10:11:55 +0100
commit21aa32d30dbf319f2d336e0cb68d3a3235869fbb (patch)
treef8dc171c75e56b4b96254c87c60a37cd2f34273f /lib/connect.h
parent0b8d682f81ee9acb763dd4c9ad805fe08d1227c0 (diff)
downloadgnurl-21aa32d30dbf319f2d336e0cb68d3a3235869fbb.tar.gz
gnurl-21aa32d30dbf319f2d336e0cb68d3a3235869fbb.tar.bz2
gnurl-21aa32d30dbf319f2d336e0cb68d3a3235869fbb.zip
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/connect.h')
-rw-r--r--lib/connect.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/connect.h b/lib/connect.h
index a7cbc9bc2..5e48eb644 100644
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -35,9 +35,9 @@ CURLcode Curl_connecthost(struct connectdata *conn,
/* generic function that returns how much time there's left to run, according
to the timeouts set */
-long Curl_timeleft(struct Curl_easy *data,
- struct timeval *nowp,
- bool duringconnect);
+time_t Curl_timeleft(struct Curl_easy *data,
+ struct timeval *nowp,
+ bool duringconnect);
#define DEFAULT_CONNECT_TIMEOUT 300000 /* milliseconds == five minutes */
#define HAPPY_EYEBALLS_TIMEOUT 200 /* milliseconds to wait between