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

Unified Diff: third_party/zlib/gzio.c

Issue 17358: Apply Gears modifications to zlib to our copy, so we're both using the same... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 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.google ('k') | third_party/zlib/zutil.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/gzio.c
===================================================================
--- third_party/zlib/gzio.c (revision 7877)
+++ third_party/zlib/gzio.c (working copy)
@@ -74,11 +74,15 @@
local gzFile gz_open OF((const char *path, const char *mode, int fd));
+#ifndef NO_GZCOMPRESS // Google Gears addition, to avoid compile warning
local int do_flush OF((gzFile file, int flush));
+#endif
local int get_byte OF((gz_stream *s));
local void check_header OF((gz_stream *s));
local int destroy OF((gz_stream *s));
+#ifndef NO_GZCOMPRESS // Google Gears addition, to avoid compile warning
local void putLong OF((FILE *file, uLong x));
+#endif
local uLong getLong OF((gz_stream *s));
/* ===========================================================================
@@ -914,6 +918,7 @@
return s->transparent;
}
+#ifndef NO_GZCOMPRESS // Google Gears addition, to avoid compile warning
/* ===========================================================================
Outputs a long in LSB order to the given file
*/
@@ -927,6 +932,7 @@
x >>= 8;
}
}
+#endif
/* ===========================================================================
Reads a long in LSB order from the given gz_stream. Sets z_err in case
@@ -971,7 +977,8 @@
return destroy((gz_stream*)file);
}
-#ifdef STDC
+// Google Gears modification: strerror is not present on WinCE.
+#if defined(STDC) && !defined(_WIN32_WCE)
# define zstrerror(errnum) strerror(errnum)
#else
# define zstrerror(errnum) ""
« no previous file with comments | « third_party/zlib/README.google ('k') | third_party/zlib/zutil.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698