Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Unified Diff: core/src/fxcodec/fx_zlib/zlib_v128/zlib.h

Issue 330023004: resolve symbol collsion with zlib 1.2.8 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Add a missing file Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/include/thirdparties/zlib/zlib.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/src/fxcodec/fx_zlib/zlib_v128/zlib.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h b/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h
index ec8ca7adb8d1b786c5c71449ee50b03999fd8c81..9eb5e3a011e94ffaaa53bab9e3dd15fb487dafbb 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"
« no previous file with comments | « core/include/thirdparties/zlib/zlib.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698