diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-04 02:01:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-04 03:37:50 +0300 |
| commit | 6c328cd056e1700d63692cc018bb3f8c42d7f963 (patch) | |
| tree | f12b6877353d31346f8e28f8c30e4205301066e3 /src/gui/windows/whoisonline.cpp | |
| parent | 7a77bf630d5588aaa73930fc761cda278e01add9 (diff) | |
| download | manaplus-6c328cd056e1700d63692cc018bb3f8c42d7f963.tar.gz manaplus-6c328cd056e1700d63692cc018bb3f8c42d7f963.tar.bz2 manaplus-6c328cd056e1700d63692cc018bb3f8c42d7f963.tar.xz manaplus-6c328cd056e1700d63692cc018bb3f8c42d7f963.zip | |
Fix libcurl version checks.
Diffstat (limited to 'src/gui/windows/whoisonline.cpp')
| -rw-r--r-- | src/gui/windows/whoisonline.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 5b9fadb5d..1bd4a633c 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -73,11 +73,6 @@ #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 @@ -558,9 +553,9 @@ int WhoIsOnline::downloadThread(void *ptr) curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, ptr); -#if CURLVERSION_ATLEAST(7, 10, 0) +#if LIBCURL_VERSION_NUM >= 0x070a00 curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); -#endif // CURLVERSION_ATLEAST(7, 10, 0) +#endif // LIBCURL_VERSION_NUM >= 0x070a00 curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 7); curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30); Net::Download::addHeaders(curl); |