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/pt | |
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/pt')
-rw-r--r-- | src/pt/test_gns_vpn.c | 7 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index 069277a00..90405fe37 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c | |||
@@ -37,11 +37,8 @@ | |||
37 | * you should get a warning that gnunet-dns2gns failed to 'bind'. | 37 | * you should get a warning that gnunet-dns2gns failed to 'bind'. |
38 | */ | 38 | */ |
39 | #include "platform.h" | 39 | #include "platform.h" |
40 | #if HAVE_CURL_CURL_H | 40 | /* Just included for the right curl.h */ |
41 | #include <curl/curl.h> | 41 | #include "gnunet_curl_lib.h" |
42 | #elif HAVE_GNURL_CURL_H | ||
43 | #include <gnurl/curl.h> | ||
44 | #endif | ||
45 | #include <microhttpd.h> | 42 | #include <microhttpd.h> |
46 | #include "gnunet_identity_service.h" | 43 | #include "gnunet_identity_service.h" |
47 | #include "gnunet_namestore_service.h" | 44 | #include "gnunet_namestore_service.h" |
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index 0afd0f94b..7cc77fe24 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c | |||
@@ -24,11 +24,8 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
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_vpn_service.h" | 30 | #include "gnunet_vpn_service.h" |
34 | #include "gnunet_testing_lib.h" | 31 | #include "gnunet_testing_lib.h" |