From 6360d452fed76412004dcaf376a40dd09aaa58b4 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sat, 23 Jul 2016 09:04:50 +0200 Subject: [PATCH] Make compatible with libcurl >= 7.50 --- ChangeLog.txt | 5 +++++ src/cpp-utils/network/CurlHttpClient.cpp | 1 - src/cpp-utils/network/CurlHttpClient.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index b8d533fd..7ab06500 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Version 0.9.6 (unreleased) +--------------- +Compatibility: +* Compatible with libcurl >= 7.50.0 + Version 0.9.5 --------------- Fixed Bugs: diff --git a/src/cpp-utils/network/CurlHttpClient.cpp b/src/cpp-utils/network/CurlHttpClient.cpp index c80a0a62..ee6345f4 100644 --- a/src/cpp-utils/network/CurlHttpClient.cpp +++ b/src/cpp-utils/network/CurlHttpClient.cpp @@ -3,7 +3,6 @@ #include "CurlHttpClient.h" #include #include -#include #include using boost::none; diff --git a/src/cpp-utils/network/CurlHttpClient.h b/src/cpp-utils/network/CurlHttpClient.h index d86831b7..439335b8 100644 --- a/src/cpp-utils/network/CurlHttpClient.h +++ b/src/cpp-utils/network/CurlHttpClient.h @@ -4,6 +4,7 @@ #include "HttpClient.h" #include "../macros.h" +#include namespace cpputils { @@ -16,7 +17,7 @@ namespace cpputils { boost::optional get(const std::string &url, boost::optional timeoutMsec = boost::none) override; private: - void *curl; + CURL *curl; static size_t write_data(void *ptr, size_t size, size_t nmemb, std::ostringstream *stream);