From f601e770ac2f74aef0fcead977ff0bd95ce57f99 Mon Sep 17 00:00:00 2001 From: tastytea Date: Fri, 10 Jan 2020 17:43:50 +0100 Subject: [PATCH] Define CURLAUTH_BEARER as CURLAUTH_ANY with libcurl < 7.61.0 --- src/curl_wrapper.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/curl_wrapper.cpp b/src/curl_wrapper.cpp index 97894e0..cf6adfe 100644 --- a/src/curl_wrapper.cpp +++ b/src/curl_wrapper.cpp @@ -183,17 +183,12 @@ void CURLWrapper::set_access_token(const string_view access_token) _curl_buffer_error}; } - #if LIBCURL_VERSION_NUM >= 0x073d00 // libcurl >= 7.61.0. - { - //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); - } - #endif +#if (LIBCURL_VERSION_NUM < 0x073d00) // libcurl < 7.61.0. +#define CURLAUTH_BEARER CURLAUTH_ANY +#endif + + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg, hicpp-signed-bitwise) + code = curl_easy_setopt(_connection, CURLOPT_HTTPAUTH, CURLAUTH_BEARER); if (code != CURLE_OK) { throw CURLException{code, "Could not set authorization token.",