diff options
| author | Patrick Monnerat <patrick@monnerat.net> | 2017-11-13 14:20:41 +0100 |
|---|---|---|
| committer | Patrick Monnerat <patrick@monnerat.net> | 2017-11-13 14:20:41 +0100 |
| commit | def2ca2628fff1973f558e45dd8fe84ca00b54d5 (patch) | |
| tree | 27f3b60c71af818b72d2b5deb46cc2c5fae56284 | |
| parent | fa1512b2a01fd5feb921c20412f4b7526ac70de6 (diff) | |
zlib/brotli: only include header files in modules needing them
There is a conflict on symbol 'free_func' between openssl/crypto.h and
zlib.h on AIX. This is an attempt to resolve it.
Bug: https://curl.haxx.se/mail/lib-2017-11/0032.html
Reported-By: Michael Felt
| -rw-r--r-- | lib/content_encoding.c | 13 | ||||
| -rw-r--r-- | lib/urldata.h | 12 | ||||
| -rw-r--r-- | lib/version.c | 12 |
3 files changed, 25 insertions, 12 deletions
diff --git a/lib/content_encoding.c b/lib/content_encoding.c index 626bb8ec9..3d061375c 100644 --- a/lib/content_encoding.c +++ b/lib/content_encoding.c @@ -25,6 +25,19 @@ #include "urldata.h" #include <curl/curl.h> #include <stddef.h> + +#ifdef HAVE_ZLIB_H +#include <zlib.h> +#ifdef __SYMBIAN32__ +/* zlib pollutes the namespace with this definition */ +#undef WIN32 +#endif +#endif + +#ifdef HAVE_BROTLI +#include <brotli/decode.h> +#endif + #include "sendf.h" #include "http.h" #include "content_encoding.h" diff --git a/lib/urldata.h b/lib/urldata.h index 7dfb26b6d..94f692223 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -88,18 +88,6 @@ #include "timeval.h" -#ifdef HAVE_ZLIB_H -#include <zlib.h> /* for content-encoding */ -#ifdef __SYMBIAN32__ -/* zlib pollutes the namespace with this definition */ -#undef WIN32 -#endif -#endif - -#ifdef HAVE_BROTLI -#include <brotli/decode.h> -#endif - #include <curl/curl.h> #include "http_chunks.h" /* for the structs and enum stuff */ diff --git a/lib/version.c b/lib/version.c index 66c761e34..79cc0bba4 100644 --- a/lib/version.c +++ b/lib/version.c @@ -64,6 +64,18 @@ #define CURL_LIBSSH2_VERSION LIBSSH2_VERSION #endif +#ifdef HAVE_ZLIB_H +#include <zlib.h> +#ifdef __SYMBIAN32__ +/* zlib pollutes the namespace with this definition */ +#undef WIN32 +#endif +#endif + +#ifdef HAVE_BROTLI +#include <brotli/decode.h> +#endif + void Curl_version_init(void); /* For thread safety purposes this function is called by global_init so that |