From c47a62969f1733ec32f503b335738f4e438ee7b3 Mon Sep 17 00:00:00 2001 From: tastytea Date: Fri, 10 Jan 2020 16:18:59 +0100 Subject: [PATCH] Only use CURLAUTH_BEARER if libcurl supports it. --- src/curl_wrapper.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/curl_wrapper.cpp b/src/curl_wrapper.cpp index 18ab7a0..0c9a3f6 100644 --- a/src/curl_wrapper.cpp +++ b/src/curl_wrapper.cpp @@ -23,7 +23,6 @@ #include #include #include -#include namespace mastodonpp { @@ -184,11 +183,14 @@ void CURLWrapper::set_access_token(const string_view access_token) _curl_buffer_error}; } - // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg, hicpp-signed-bitwise) - code = curl_easy_setopt(_connection, CURLOPT_HTTPAUTH, CURLAUTH_BEARER); - if (code == CURLE_NOT_BUILT_IN) // libcurl < 7.61.0. + if constexpr (LIBCURL_VERSION_NUM >= 0x073d00) // libcurl >= 7.61.0. { - // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg, hicpp-signed-bitwise) + //NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-signed-bitwise) + code = curl_easy_setopt(_connection, CURLOPT_HTTPAUTH, CURLAUTH_BEARER); + } + else + { + //NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-signed-bitwise) code = curl_easy_setopt(_connection, CURLOPT_HTTPAUTH, CURLAUTH_ANY); } if (code != CURLE_OK)