diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-03 14:26:53 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-03 14:26:53 -0400 |
| commit | f53f4a8a2d215dac634effea575a27e000dfcb29 (patch) | |
| tree | 5782e71da9e12ab6081e47f8eaf8eeb908e1428a /Utilities/cmcurl/lib/speedcheck.c | |
| parent | e1c11352f231ae310339cd539ed59cb302bd4dbe (diff) | |
| parent | 202adcfe056681109fe61569ecdb3bd69f0b4f97 (diff) | |
| download | cmake-f53f4a8a2d215dac634effea575a27e000dfcb29.tar.gz | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2016-08-03 (f2cb3a01)
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 ac7447c410..13c34af96b 100644 --- a/Utilities/cmcurl/lib/speedcheck.c +++ b/Utilities/cmcurl/lib/speedcheck.c @@ -9,7 +9,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is @@ -28,12 +28,12 @@ #include "multiif.h" #include "speedcheck.h" -void Curl_speedinit(struct SessionHandle *data) +void Curl_speedinit(struct Curl_easy *data) { memset(&data->state.keeps_speed, 0, sizeof(struct timeval)); } -CURLcode Curl_speedcheck(struct SessionHandle *data, +CURLcode Curl_speedcheck(struct Curl_easy *data, struct timeval now) { if((data->progress.current_speed >= 0) && |