summaryrefslogtreecommitdiff
path: root/src/pt
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/pt
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/pt')
-rw-r--r--src/pt/test_gns_vpn.c7
-rw-r--r--src/pt/test_gnunet_vpn.c7
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 @@
* you should get a warning that gnunet-dns2gns failed to 'bind'.
*/
#include "platform.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"
#include <microhttpd.h>
#include "gnunet_identity_service.h"
#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 @@
* @author Christian Grothoff
*/
#include "platform.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"
#include <microhttpd.h>
#include "gnunet_vpn_service.h"
#include "gnunet_testing_lib.h"