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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/zlib/mozzconf.h

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« content/public/browser/BUILD.gn ('K') | « third_party/libusb/BUILD.gn ('k') | tools/gritsettings/resource_ids » ('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 25c1d827a89882c91c1eef2e39a1ec1b526728ec..f205b3103df19e82f82173b73b17a81b503edec9 100644
--- a/third_party/zlib/mozzconf.h
+++ b/third_party/zlib/mozzconf.h
@@ -160,7 +160,7 @@
#define internal_state MOZ_Z_internal_state
/* Mangle Byte types except on Mac. */
-#if !defined(__MACTYPES__)
+#if !defined(__MACTYPES__) && !defined(OS_ANDROID)
#define Byte MOZ_Z_Byte
#define Bytef MOZ_Z_Bytef
#endif
« content/public/browser/BUILD.gn ('K') | « third_party/libusb/BUILD.gn ('k') | tools/gritsettings/resource_ids » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698