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 /lib/content_encoding.c | |
| parent | fa1512b2a01fd5feb921c20412f4b7526ac70de6 (diff) | |
| download | curl-def2ca2628fff1973f558e45dd8fe84ca00b54d5.tar.gz | |
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
Diffstat (limited to 'lib/content_encoding.c')
| -rw-r--r-- | lib/content_encoding.c | 13 |
1 files changed, 13 insertions, 0 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" |