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

Unified Diff: third_party/zlib/mozzconf.h

Issue 2121343002: [zlib] Fix unmangled symbols. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modify .patch files to reflect current condition Created 4 years, 5 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 | « third_party/zlib/google.patch ('k') | third_party/zlib/simd.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/mozzconf.h
diff --git a/third_party/zlib/mozzconf.h b/third_party/zlib/mozzconf.h
index 80994c98125bffbb7e6a62fb83f1fb92c1cde611..10aca44b29a4dadf73581b52bf8759284f5c7c5a 100644
--- a/third_party/zlib/mozzconf.h
+++ b/third_party/zlib/mozzconf.h
@@ -162,12 +162,21 @@
#define internal_state MOZ_Z_internal_state
/* New as of zlib 1.2.8 */
+#define _tr_flush_bits MOZ_Z__tr_flush_bits
#define deflateResetKeep MOZ_Z_deflateResetKeep
#define deflatePending MOZ_Z_deflatePending
#define inflateGetDictionary MOZ_Z_inflateGetDictionary
#define inflateResetKeep MOZ_Z_inflateResetKeep
#define gzopen_w MOZ_Z_gzopen_w
+/* Chromium-specific modifications */
+#define copy_with_crc MOZ_Z__copy_with_crc
+#define crc_finalize MOZ_Z__crc_finalize
+#define crc_reset MOZ_Z__crc_reset
+// read_buf used to be local, but this was changed in simd.patch.
+#define read_buf MOZ_Z__read_buf
+#define x86_check_features MOZ_Z__x86_check_features
+
/* Mangle Byte types except on Mac. */
#if !defined(__MACTYPES__)
#define Byte MOZ_Z_Byte
« no previous file with comments | « third_party/zlib/google.patch ('k') | third_party/zlib/simd.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698