resolve symbol collsion with zlib 1.2.8
authorBo Xu <bo_xu@foxitsoftware.com>
Thu, 12 Jun 2014 20:42:40 +0000 (13:42 -0700)
committerBo Xu <bo_xu@foxitsoftware.com>
Thu, 12 Jun 2014 20:42:40 +0000 (13:42 -0700)
R=jam@chromium.org

Review URL: https://codereview.chromium.org/330023004

core/include/thirdparties/zlib/zlib.h
core/src/fxcodec/fx_zlib/zlib_v128/zlib.h

index 5850070..bb721cf 100644 (file)
@@ -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
 #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"
 
index ec8ca7a..9eb5e3a 100644 (file)
@@ -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
 #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"