From 8719f4fcc1685a320e648166cf6720c3e33f0434 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 30 Apr 2019 20:46:17 +0200 Subject: Make gnurl and curl mutually exclusive. This prevents issues when both curl and gnurl are available, but one of them is outdated. To get curl.h, we also now just include gnunet_curl_lib.h instead of writing the preprocessor conditionals manually. Fixes #5707 --- src/include/gnunet_curl_lib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/include/gnunet_curl_lib.h') diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h index 0cbef9c73..86cb54f6b 100644 --- a/src/include/gnunet_curl_lib.h +++ b/src/include/gnunet_curl_lib.h @@ -29,9 +29,9 @@ */ #ifndef GNUNET_CURL_LIB_H #define GNUNET_CURL_LIB_H -#if HAVE_CURL_CURL_H +#if HAVE_LIBCURL #include -#elif HAVE_GNURL_CURL_H +#elif HAVE_LIBGNURL #include #else #error "needs curl or gnurl" -- cgit v1.2.3