summaryrefslogtreecommitdiff
path: root/src/transport/plugin_transport_http.h
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/transport/plugin_transport_http.h
parent3cf07732fca4fd293874837833698fe0bfa279b2 (diff)
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/transport/plugin_transport_http.h')
-rw-r--r--src/transport/plugin_transport_http.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/transport/plugin_transport_http.h b/src/transport/plugin_transport_http.h
index 6867d3b9d..b6ada8f86 100644
--- a/src/transport/plugin_transport_http.h
+++ b/src/transport/plugin_transport_http.h
@@ -41,11 +41,8 @@
#include "gnunet_os_lib.h"
#include "gnunet_nat_lib.h"
#include "microhttpd.h"
-#if HAVE_CURL_CURL_H
-#include <curl/curl.h>
-#elif HAVE_GNURL_CURL_H
-#include <gnurl/curl.h>
-#endif
+/* Just included for the right curl.h */
+#include "gnunet_curl_lib.h"
#define DEBUG_HTTP GNUNET_EXTRA_LOGGING