core/include/thirdparties/zlib/zlib.h - Issue 330023004: resolve symbol collsion with zlib 1.2.8

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/include/thirdparties/zlib/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:

Index: core/include/thirdparties/zlib/zlib.h

diff --git a/core/include/thirdparties/zlib/zlib.h b/core/include/thirdparties/zlib/zlib.h

index 5850070baf4044b7f51c693a61482866ceea0959..bb721cfb3207f164a1e9b3f6e97350109c50f8d5 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"

« no previous file with comments | « no previous file | core/src/fxcodec/fx_zlib/zlib_v128/zlib.h » ('j') | no next file with comments »