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/include/gnunet_curl_lib.h | |
| 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/include/gnunet_curl_lib.h')
| -rw-r--r-- | src/include/gnunet_curl_lib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h index 0cbef9c73..86cb54f6b 100644 --- a/src/include/gnunet_curl_lib.h +++ b/src/include/gnunet_curl_lib.h | |||
| @@ -29,9 +29,9 @@ | |||
| 29 | */ | 29 | */ |
| 30 | #ifndef GNUNET_CURL_LIB_H | 30 | #ifndef GNUNET_CURL_LIB_H |
| 31 | #define GNUNET_CURL_LIB_H | 31 | #define GNUNET_CURL_LIB_H |
| 32 | #if HAVE_CURL_CURL_H | 32 | #if HAVE_LIBCURL |
| 33 | #include <curl/curl.h> | 33 | #include <curl/curl.h> |
| 34 | #elif HAVE_GNURL_CURL_H | 34 | #elif HAVE_LIBGNURL |
| 35 | #include <gnurl/curl.h> | 35 | #include <gnurl/curl.h> |
| 36 | #else | 36 | #else |
| 37 | #error "needs curl or gnurl" | 37 | #error "needs curl or gnurl" |