summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorBo Xu <bo_xu@foxitsoftware.com>2014-06-12 13:42:40 -0700
committerBo Xu <bo_xu@foxitsoftware.com>2014-06-12 13:42:40 -0700
commitfda75e4fbbf6857d7255c670d1a9026015160390 (patch)
treec88438591d8cc680233b25070b140501fe6e9844 /core/include
parent394010d55368f6d2e2d64fff0b7fc22d7f59ba53 (diff)
downloadpdfium-fda75e4fbbf6857d7255c670d1a9026015160390.tar.xz
resolve symbol collsion with zlib 1.2.8
R=jam@chromium.org Review URL: https://codereview.chromium.org/330023004
Diffstat (limited to 'core/include')
-rw-r--r--core/include/thirdparties/zlib/zlib.h5
1 files changed, 5 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"