aboutsummaryrefslogtreecommitdiff
path: root/src/curl
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2019-04-30 20:46:17 +0200
committerFlorian Dold <florian.dold@gmail.com>2019-04-30 20:48:23 +0200
commit8719f4fcc1685a320e648166cf6720c3e33f0434 (patch)
tree28bc3e764d86ea249b4fd040b4ab7a9cb92b354d /src/curl
parent3cf07732fca4fd293874837833698fe0bfa279b2 (diff)
downloadgnunet-8719f4fcc1685a320e648166cf6720c3e33f0434.tar.gz
gnunet-8719f4fcc1685a320e648166cf6720c3e33f0434.zip
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
Diffstat (limited to 'src/curl')
-rw-r--r--src/curl/curl.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/curl/curl.c b/src/curl/curl.c
index 10475fe2e..5e1c216ab 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -24,11 +24,6 @@
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "platform.h" 26#include "platform.h"
27#if HAVE_CURL_CURL_H
28#include <curl/curl.h>
29#elif HAVE_GNURL_CURL_H
30#include <gnurl/curl.h>
31#endif
32#include <jansson.h> 27#include <jansson.h>
33#include "gnunet_curl_lib.h" 28#include "gnunet_curl_lib.h"
34 29