diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-06-21 11:06:11 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-06-21 11:06:11 +0000 |
commit | 511156f37bbd1f0a8ae9deb98d2b3eea7586dfa1 (patch) | |
tree | f63412717bad83d51332ebcb241ba532cce847a2 /src | |
parent | 5d82ad8f9164461be16f62436542e098934340d4 (diff) | |
download | gnunet-511156f37bbd1f0a8ae9deb98d2b3eea7586dfa1.tar.gz gnunet-511156f37bbd1f0a8ae9deb98d2b3eea7586dfa1.zip |
support gnurl's curl.h being in include/gnurl/ OR include/curl/
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.c | 7 | ||||
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_client.c | 5 | ||||
-rw-r--r-- | src/pt/test_gns_vpn.c | 4 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.c | 4 | ||||
-rw-r--r-- | src/transport/plugin_transport_http.h | 4 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_client.c | 4 |
7 files changed, 30 insertions, 2 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 08cfdf4df..d5ccd81e7 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -29,7 +29,11 @@ | |||
29 | */ | 29 | */ |
30 | #include "platform.h" | 30 | #include "platform.h" |
31 | #include <microhttpd.h> | 31 | #include <microhttpd.h> |
32 | #if HAVE_CURL_CURL_H | ||
32 | #include <curl/curl.h> | 33 | #include <curl/curl.h> |
34 | #elif HAVE_GNURL_CURL_H | ||
35 | #include <gnurl/curl.h> | ||
36 | #endif | ||
33 | #include <gnutls/gnutls.h> | 37 | #include <gnutls/gnutls.h> |
34 | #include <gnutls/x509.h> | 38 | #include <gnutls/x509.h> |
35 | #include <gnutls/abstract.h> | 39 | #include <gnutls/abstract.h> |
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 7411c9bc9..fb6d01fcd 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -24,7 +24,11 @@ | |||
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 | #include <curl/curl.h> | 28 | #include <curl/curl.h> |
29 | #elif HAVE_GNURL_CURL_H | ||
30 | #include <gnurl/curl.h> | ||
31 | #endif | ||
28 | #include <microhttpd.h> | 32 | #include <microhttpd.h> |
29 | #include "gnunet_namestore_service.h" | 33 | #include "gnunet_namestore_service.h" |
30 | #include "gnunet_gns_service.h" | 34 | #include "gnunet_gns_service.h" |
@@ -246,7 +250,7 @@ static void | |||
246 | start_curl (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 250 | start_curl (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
247 | { | 251 | { |
248 | GNUNET_asprintf (&url, | 252 | GNUNET_asprintf (&url, |
249 | "http://%s:%d/hello_world", | 253 | "http://%s:%d/hello_world", |
250 | TEST_DOMAIN, PORT); | 254 | TEST_DOMAIN, PORT); |
251 | curl = curl_easy_init (); | 255 | curl = curl_easy_init (); |
252 | curl_easy_setopt (curl, CURLOPT_URL, url); | 256 | curl_easy_setopt (curl, CURLOPT_URL, url); |
@@ -475,4 +479,3 @@ main (int argc, char *const *argv) | |||
475 | } | 479 | } |
476 | 480 | ||
477 | /* end of test_gns_vpn.c */ | 481 | /* end of test_gns_vpn.c */ |
478 | |||
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c index 004a77c02..ba7bdb2cc 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.c +++ b/src/hostlist/gnunet-daemon-hostlist_client.c | |||
@@ -29,7 +29,12 @@ | |||
29 | #include "gnunet_statistics_service.h" | 29 | #include "gnunet_statistics_service.h" |
30 | #include "gnunet_transport_service.h" | 30 | #include "gnunet_transport_service.h" |
31 | #include "gnunet-daemon-hostlist.h" | 31 | #include "gnunet-daemon-hostlist.h" |
32 | #if HAVE_CURL_CURL_H | ||
32 | #include <curl/curl.h> | 33 | #include <curl/curl.h> |
34 | #elif HAVE_GNURL_CURL_H | ||
35 | #include <gnurl/curl.h> | ||
36 | #endif | ||
37 | |||
33 | 38 | ||
34 | 39 | ||
35 | /** | 40 | /** |
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index 28e83009f..2ac41d810 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c | |||
@@ -24,7 +24,11 @@ | |||
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 | #include <curl/curl.h> | 28 | #include <curl/curl.h> |
29 | #elif HAVE_GNURL_CURL_H | ||
30 | #include <gnurl/curl.h> | ||
31 | #endif | ||
28 | #include <microhttpd.h> | 32 | #include <microhttpd.h> |
29 | #include "gnunet_identity_service.h" | 33 | #include "gnunet_identity_service.h" |
30 | #include "gnunet_namestore_service.h" | 34 | #include "gnunet_namestore_service.h" |
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index 4a223e595..29c087106 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c | |||
@@ -24,7 +24,11 @@ | |||
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 | #include <curl/curl.h> | 28 | #include <curl/curl.h> |
29 | #elif HAVE_GNURL_CURL_H | ||
30 | #include <gnurl/curl.h> | ||
31 | #endif | ||
28 | #include <microhttpd.h> | 32 | #include <microhttpd.h> |
29 | #include "gnunet_vpn_service.h" | 33 | #include "gnunet_vpn_service.h" |
30 | #include "gnunet_testing_lib.h" | 34 | #include "gnunet_testing_lib.h" |
diff --git a/src/transport/plugin_transport_http.h b/src/transport/plugin_transport_http.h index 5655d7d6f..683f33f50 100644 --- a/src/transport/plugin_transport_http.h +++ b/src/transport/plugin_transport_http.h | |||
@@ -41,7 +41,11 @@ | |||
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 | #include <curl/curl.h> | 45 | #include <curl/curl.h> |
46 | #elif HAVE_GNURL_CURL_H | ||
47 | #include <gnurl/curl.h> | ||
48 | #endif | ||
45 | 49 | ||
46 | 50 | ||
47 | #define DEBUG_HTTP GNUNET_EXTRA_LOGGING | 51 | #define DEBUG_HTTP GNUNET_EXTRA_LOGGING |
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 7d935b4f0..ad669d20e 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c | |||
@@ -49,7 +49,11 @@ | |||
49 | #include "gnunet_protocols.h" | 49 | #include "gnunet_protocols.h" |
50 | #include "gnunet_transport_plugin.h" | 50 | #include "gnunet_transport_plugin.h" |
51 | #include "plugin_transport_http_common.h" | 51 | #include "plugin_transport_http_common.h" |
52 | #if HAVE_CURL_CURL_H | ||
52 | #include <curl/curl.h> | 53 | #include <curl/curl.h> |
54 | #elif HAVE_GNURL_CURL_H | ||
55 | #include <gnurl/curl.h> | ||
56 | #endif | ||
53 | 57 | ||
54 | 58 | ||
55 | #define LOG(kind,...) GNUNET_log_from(kind, PLUGIN_NAME, __VA_ARGS__) | 59 | #define LOG(kind,...) GNUNET_log_from(kind, PLUGIN_NAME, __VA_ARGS__) |