summaryrefslogtreecommitdiffstats
path: root/remoting/base
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-15 18:21:53 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-15 18:21:53 +0000
commit7db7417c5dc907e4667a8ab2161c3b3ba2efae43 (patch)
tree58b673a9396159fee666363a3015121a0cababb7 /remoting/base
parent502aaaef87e7562dde1feb50e3287f5864508574 (diff)
downloadchromium_src-7db7417c5dc907e4667a8ab2161c3b3ba2efae43.zip
chromium_src-7db7417c5dc907e4667a8ab2161c3b3ba2efae43.tar.gz
chromium_src-7db7417c5dc907e4667a8ab2161c3b3ba2efae43.tar.bz2
Don't call the zlib functions with the MOZ_Z_ prefix
in the source code. R=agl,hclam,jar BUG=none TEST=No build or test failures Review URL: http://codereview.chromium.org/6529006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
-rw-r--r--remoting/base/compressor_zlib.cc7
-rw-r--r--remoting/base/decompressor_zlib.cc7
2 files changed, 0 insertions, 14 deletions
diff --git a/remoting/base/compressor_zlib.cc b/remoting/base/compressor_zlib.cc
index 0128361..05ad621 100644
--- a/remoting/base/compressor_zlib.cc
+++ b/remoting/base/compressor_zlib.cc
@@ -6,13 +6,6 @@
#if defined(USE_SYSTEM_ZLIB)
#include <zlib.h>
-// 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
-#define MOZ_Z_deflateInit_ deflateInit_
#else
#include "third_party/zlib/zlib.h"
#endif
diff --git a/remoting/base/decompressor_zlib.cc b/remoting/base/decompressor_zlib.cc
index 4eb5168..770abd5 100644
--- a/remoting/base/decompressor_zlib.cc
+++ b/remoting/base/decompressor_zlib.cc
@@ -6,13 +6,6 @@
#if defined(USE_SYSTEM_ZLIB)
#include <zlib.h>
-// 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_inflate inflate
-#define MOZ_Z_inflateEnd inflateEnd
-#define MOZ_Z_inflateInit_ inflateInit_
#else
#include "third_party/zlib/zlib.h"
#endif