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/gns/test_gns_proxy.c | |
| 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/gns/test_gns_proxy.c')
| -rw-r--r-- | src/gns/test_gns_proxy.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 2a7f8104b..053f5f898 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
| @@ -24,11 +24,8 @@ | |||
| 24 | * @author Martin Schanzenbach | 24 | * @author Martin Schanzenbach |
| 25 | */ | 25 | */ |
| 26 | #include "platform.h" | 26 | #include "platform.h" |
| 27 | #if HAVE_CURL_CURL_H | 27 | /* Just included for the right curl.h */ |
| 28 | #include <curl/curl.h> | 28 | #include "gnunet_curl_lib.h" |
| 29 | #elif HAVE_GNURL_CURL_H | ||
| 30 | #include <gnurl/curl.h> | ||
| 31 | #endif | ||
| 32 | #include <microhttpd.h> | 29 | #include <microhttpd.h> |
| 33 | #include "gnunet_util_lib.h" | 30 | #include "gnunet_util_lib.h" |
| 34 | #include "gnutls/x509.h" | 31 | #include "gnutls/x509.h" |