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/transport | |
| 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/transport')
| -rw-r--r-- | src/transport/plugin_transport_http.h | 4 | ||||
| -rw-r--r-- | src/transport/plugin_transport_http_client.c | 4 |
2 files changed, 8 insertions, 0 deletions
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__) |