diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-06-12 13:42:40 -0700 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-06-12 13:42:40 -0700 |
| commit | fda75e4fbbf6857d7255c670d1a9026015160390 (patch) | |
| tree | c88438591d8cc680233b25070b140501fe6e9844 | |
| parent | 394010d55368f6d2e2d64fff0b7fc22d7f59ba53 (diff) | |
| download | pdfium-fda75e4fbbf6857d7255c670d1a9026015160390.tar.xz | |
resolve symbol collsion with zlib 1.2.8
R=jam@chromium.org
Review URL: https://codereview.chromium.org/330023004
| -rw-r--r-- | core/include/thirdparties/zlib/zlib.h | 5 | ||||
| -rw-r--r-- | core/src/fxcodec/fx_zlib/zlib_v128/zlib.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/include/thirdparties/zlib/zlib.h b/core/include/thirdparties/zlib/zlib.h index 5850070baf..bb721cfb32 100644 --- a/core/include/thirdparties/zlib/zlib.h +++ b/core/include/thirdparties/zlib/zlib.h @@ -42,6 +42,7 @@ #define deflateInit2_ FPDFAPI_deflateInit2_ #define deflateSetDictionary FPDFAPI_deflateSetDictionary #define deflateReset FPDFAPI_deflateReset +#define deflatePending FPDFAPI_deflatePending #define deflatePrime FPDFAPI_deflatePrime #define deflateParams FPDFAPI_deflateParams #define deflateBound FPDFAPI_deflateBound @@ -79,14 +80,18 @@ #define _tr_init FPDFAPI_tr_init #define _tr_align FPDFAPI_tr_align #define _tr_tally FPDFAPI_tr_tally +#define _tr_flush_bits FPDFAPI_tr_flush_bits #define adler32_combine FPDFAPI_adler32_combine #define inflatePrime FPDFAPI_inflatePrime +#define inflateGetDictionary FPDFAPI_inflateGetDictionary #define inflateGetHeader FPDFAPI_inflateGetHeader #define crc32_combine FPDFAPI_crc32_combine #define inflateReset2 FPDFAPI_inflateReset2 #define inflateUndermine FPDFAPI_inflateUndermine #define inflateMark FPDFAPI_inflateMark #define adler32_combine64 FPDFAPI_adler32_combine64 +#define inflateResetKeep FPDFAPI_inflateResetKeep +#define deflateResetKeep FPDFAPI_deflateResetKeep #include "zconf.h" diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h b/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h index ec8ca7adb8..9eb5e3a011 100644 --- a/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h +++ b/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h @@ -46,6 +46,7 @@ #define deflateInit2_ FPDFAPI_deflateInit2_ #define deflateSetDictionary FPDFAPI_deflateSetDictionary #define deflateReset FPDFAPI_deflateReset +#define deflatePending FPDFAPI_deflatePending #define deflatePrime FPDFAPI_deflatePrime #define deflateParams FPDFAPI_deflateParams #define deflateBound FPDFAPI_deflateBound @@ -83,14 +84,18 @@ #define _tr_init FPDFAPI_tr_init #define _tr_align FPDFAPI_tr_align #define _tr_tally FPDFAPI_tr_tally +#define _tr_flush_bits FPDFAPI_tr_flush_bits #define adler32_combine FPDFAPI_adler32_combine #define inflatePrime FPDFAPI_inflatePrime +#define inflateGetDictionary FPDFAPI_inflateGetDictionary #define inflateGetHeader FPDFAPI_inflateGetHeader #define crc32_combine FPDFAPI_crc32_combine #define inflateReset2 FPDFAPI_inflateReset2 #define inflateUndermine FPDFAPI_inflateUndermine #define inflateMark FPDFAPI_inflateMark #define adler32_combine64 FPDFAPI_adler32_combine64 +#define inflateResetKeep FPDFAPI_inflateResetKeep +#define deflateResetKeep FPDFAPI_deflateResetKeep #include "zconf.h" |