From be3520bf38ca18c252ccc78ec3fac53a4310b238 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Fri, 13 Oct 2006 05:38:49 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=11280 --- checkin_notes | 8 ++++++++ client/http_curl.C | 8 ++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/checkin_notes b/checkin_notes index 564663b2c2..1560004c39 100755 --- a/checkin_notes +++ b/checkin_notes @@ -11086,3 +11086,11 @@ Charlie 12 Oct 2006 ViewResources.cpp common/ wxPieCtrl.cpp,h + +Rom 12 Oct 2006 + - Bug Fix: CURLOPT_MAX_SEND_SPEED_LARGE and CURLOPT_MAX_RECV_SPEED_LARGE + are apart of an enum and not a preprocessor define. Check for + compatibility by using LIBCURL_VERSION_NUM instead. + + client/ + http_curl.C diff --git a/client/http_curl.C b/client/http_curl.C index bb30cf8156..73878f1604 100644 --- a/client/http_curl.C +++ b/client/http_curl.C @@ -1039,23 +1039,19 @@ void HTTP_OP::update_speed() { } void HTTP_OP::set_speed_limit(bool is_upload, double bytes_sec) { +#if LIBCURL_VERSION_NUM >= 0x070f05 CURLcode cc = CURLE_OK; -#if defined(CURLOPT_MAX_SEND_SPEED_LARGE) || defined(CURLOPT_MAX_RECV_SPEED_LARGE) curl_off_t bs = (curl_off_t)bytes_sec; -#endif if (is_upload) { -#ifdef CURLOPT_MAX_SEND_SPEED_LARGE cc = curl_easy_setopt(curlEasy, CURLOPT_MAX_SEND_SPEED_LARGE, bs); -#endif } else { -#ifdef CURLOPT_MAX_RECV_SPEED_LARGE cc = curl_easy_setopt(curlEasy, CURLOPT_MAX_RECV_SPEED_LARGE, bs); -#endif } if (cc) { msg_printf(NULL, MSG_ERROR, "Curl error: %s", curl_easy_strerror(cc)); } +#endif } const char *BOINC_RCSID_57f273bb60 = "$Id$";