From 55557aa1626a8030f7d88a0ab9746e4a9c09d454 Mon Sep 17 00:00:00 2001 From: JackBurton79 Date: Fri, 27 Jul 2018 11:20:45 +0200 Subject: [PATCH] CURLOPT_XFERINFOFUNCTION is available since libcurl 7.32.0 only. Since it's just cosmetic, allow compiling with older libcurl, too. fixes build on RedHat/CentOS 7 Change-Id: I169ad84d15e61012d1d38a9b41af7eef81683bf7 --- src/kits/package/FetchFileJob.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/kits/package/FetchFileJob.cpp b/src/kits/package/FetchFileJob.cpp index fa55dcdbba..e4730e92aa 100644 --- a/src/kits/package/FetchFileJob.cpp +++ b/src/kits/package/FetchFileJob.cpp @@ -90,12 +90,15 @@ FetchFileJob::Execute() if (handle == NULL) return B_NO_MEMORY; - result = curl_easy_setopt(handle, CURLOPT_NOPROGRESS, 0); + #if LIBCURL_VERSION_MAJOR > 7 \ + || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 32) + result = curl_easy_setopt(handle, CURLOPT_NOPROGRESS, 0); - result = curl_easy_setopt(handle, CURLOPT_XFERINFOFUNCTION, - &_TransferCallback); - if (result != CURLE_OK) - return B_BAD_VALUE; + result = curl_easy_setopt(handle, CURLOPT_XFERINFOFUNCTION, + &_TransferCallback); + if (result != CURLE_OK) + return B_BAD_VALUE; + #endif result = curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, this); if (result != CURLE_OK)