mirror of
https://github.com/curl/curl.git
synced 2026-07-23 23:37:22 +03:00
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
This commit is contained in:
parent
fa1512b2a0
commit
def2ca2628
3 changed files with 25 additions and 12 deletions
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue