summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 00:03:56 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 00:03:56 +0000
commit6b635eb7d60e4865ff4785dbcf47ace0f39c1e95 (patch)
tree97a6399b5525147aefdcae325422f9e04dda78eb /net
parent6686aeb3742d2e3f1531ea79b98f94bcc957007a (diff)
downloadchromium_src-6b635eb7d60e4865ff4785dbcf47ace0f39c1e95.zip
chromium_src-6b635eb7d60e4865ff4785dbcf47ace0f39c1e95.tar.gz
chromium_src-6b635eb7d60e4865ff4785dbcf47ace0f39c1e95.tar.bz2
Linux system libs: build fix.
net_unittests was broken when using the system zlib. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/gzip_filter_unittest.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc
index 377b521..8ca1f4d 100644
--- a/net/base/gzip_filter_unittest.cc
+++ b/net/base/gzip_filter_unittest.cc
@@ -6,6 +6,12 @@
#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"