diff options
| author | Florian Dold <florian.dold@gmail.com> | 2019-04-30 20:46:17 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2019-04-30 20:48:23 +0200 |
| commit | 8719f4fcc1685a320e648166cf6720c3e33f0434 (patch) | |
| tree | 28bc3e764d86ea249b4fd040b4ab7a9cb92b354d /src/transport/plugin_transport_http.h | |
| parent | 3cf07732fca4fd293874837833698fe0bfa279b2 (diff) | |
| download | gnunet-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/transport/plugin_transport_http.h')
| -rw-r--r-- | src/transport/plugin_transport_http.h | 7 |
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 @@ | |||
| 41 | #include "gnunet_os_lib.h" | 41 | #include "gnunet_os_lib.h" |
| 42 | #include "gnunet_nat_lib.h" | 42 | #include "gnunet_nat_lib.h" |
| 43 | #include "microhttpd.h" | 43 | #include "microhttpd.h" |
| 44 | #if HAVE_CURL_CURL_H | 44 | /* Just included for the right curl.h */ |
| 45 | #include <curl/curl.h> | 45 | #include "gnunet_curl_lib.h" |
| 46 | #elif HAVE_GNURL_CURL_H | ||
| 47 | #include <gnurl/curl.h> | ||
| 48 | #endif | ||
| 49 | 46 | ||
| 50 | 47 | ||
| 51 | #define DEBUG_HTTP GNUNET_EXTRA_LOGGING | 48 | #define DEBUG_HTTP GNUNET_EXTRA_LOGGING |