From b970fb01de5980bc4e5c6a51a961bdc6f0b0214f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 29 Jan 2017 01:27:06 +0300 Subject: Fix compilation with old libcurl versions. --- src/gui/windows/whoisonline.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/gui/windows') diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index b11b957c5..5b9fadb5d 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -73,6 +73,11 @@ #undef malloc #endif // malloc +#ifdef TMWA_SUPPORT +#define CURLVERSION_ATLEAST(a, b, c) \ + LIBCURL_VERSION_NUM >= ((a) * 0xffff + (b) * 0xff + c) +#endif // TMWA_SUPPORT + WhoIsOnline *whoIsOnline = nullptr; namespace @@ -552,7 +557,10 @@ int WhoIsOnline::downloadThread(void *ptr) curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, ptr); + +#if CURLVERSION_ATLEAST(7, 10, 0) curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); +#endif // CURLVERSION_ATLEAST(7, 10, 0) curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 7); curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30); Net::Download::addHeaders(curl); -- cgit v1.2.3-60-g2f50