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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/zlib/google.patch

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/README.chromium ('k') | third_party/zlib/mozzconf.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/google.patch
diff --git a/third_party/zlib/google.patch b/third_party/zlib/google.patch
index 362b44dc1c6d49409e93abc8632d9aa4f7b66b0a..ee00399a3dfc0588fff0fe5acc57dd1e94c030ec 100644
--- a/third_party/zlib/google.patch
+++ b/third_party/zlib/google.patch
@@ -122,7 +122,7 @@ new file mode 100644
index 0000000..80994c9
--- /dev/null
+++ b/third_party/zlib/mozzconf.h
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,178 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -287,6 +287,7 @@ index 0000000..80994c9
+#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
« no previous file with comments | « third_party/zlib/README.chromium ('k') | third_party/zlib/mozzconf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698