diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-07 16:38:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-07 16:38:00 (GMT) |
| commit | 1df9d5f91944e0b5ba00815d55bb7dc545053b4c (patch) | |
| tree | 7f3ac8bf78c485cd3254a16754657bd5d43bd561 /Utilities/cmcurl/lib/speedcheck.c | |
| parent | f4a3290ae7ae096f8b92f7adfba7088e6918bc0b (diff) | |
| parent | 4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab (diff) | |
| download | CMake-1df9d5f91944e0b5ba00815d55bb7dc545053b4c.zip CMake-1df9d5f91944e0b5ba00815d55bb7dc545053b4c.tar.gz CMake-1df9d5f91944e0b5ba00815d55bb7dc545053b4c.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2016-12-22 (44b9b4d4)
Diffstat (limited to 'Utilities/cmcurl/lib/speedcheck.c')
| -rw-r--r-- | Utilities/cmcurl/lib/speedcheck.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/cmcurl/lib/speedcheck.c b/Utilities/cmcurl/lib/speedcheck.c index 13c34af..bc15d97 100644 --- a/Utilities/cmcurl/lib/speedcheck.c +++ b/Utilities/cmcurl/lib/speedcheck.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, 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 @@ -40,8 +40,8 @@ CURLcode Curl_speedcheck(struct Curl_easy *data, data->set.low_speed_time && (Curl_tvlong(data->state.keeps_speed) != 0) && (data->progress.current_speed < data->set.low_speed_limit)) { - long howlong = Curl_tvdiff(now, data->state.keeps_speed); - long nextcheck = (data->set.low_speed_time * 1000) - howlong; + time_t howlong = Curl_tvdiff(now, data->state.keeps_speed); + time_t nextcheck = (data->set.low_speed_time * 1000) - howlong; /* We are now below the "low speed limit". If we are below it for "low speed time" seconds we consider that enough reason |