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

Unified Diff: net/base/gzip_filter_unittest.cc

Issue 6529006: Don't call the zlib functions with the MOZ_Z_ prefix... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | « net/base/gzip_filter.cc ('k') | remoting/base/compressor_zlib.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/gzip_filter_unittest.cc
===================================================================
--- net/base/gzip_filter_unittest.cc (revision 74874)
+++ net/base/gzip_filter_unittest.cc (working copy)
@@ -6,12 +6,6 @@
#include <iostream>
#if defined(USE_SYSTEM_ZLIB)
-// The code below uses the MOZ_Z_ forms of these functions in order that things
-// should work on Windows. In order to make this code cross platform, we map
-// back to the normal functions here in the case that we are using the system
-// zlib.
-#define MOZ_Z_deflate deflate
-#define MOZ_Z_deflateEnd deflateEnd
#include <zlib.h>
#else
#include "third_party/zlib/zlib.h"
@@ -152,10 +146,10 @@
}
// Do deflate
- code = MOZ_Z_deflate(&zlib_stream, Z_FINISH);
+ code = deflate(&zlib_stream, Z_FINISH);
*dest_len = *dest_len - zlib_stream.avail_out;
- MOZ_Z_deflateEnd(&zlib_stream);
+ deflateEnd(&zlib_stream);
return code;
}
« no previous file with comments | « net/base/gzip_filter.cc ('k') | remoting/base/compressor_zlib.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698