Don't call the zlib functions with the MOZ_Z_ prefix...

net/base/gzip_filter.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/gzip_filter.h"
 
 #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_inflateInit2_ inflateInit2_
-#define MOZ_Z_inflateInit_ inflateInit_
-#define MOZ_Z_inflateReset inflateReset
 #else
 #include "third_party/zlib/zlib.h"
 #endif
 
 #include "base/logging.h"
 #include "net/base/gzip_header.h"
 
 namespace net {
 
 GZipFilter::GZipFilter(const FilterContext& filter_context)
     : Filter(filter_context),
       decoding_status_(DECODING_UNINITIALIZED),
       decoding_mode_(DECODE_MODE_UNKNOWN),
       gzip_header_status_(GZIP_CHECK_HEADER_IN_PROGRESS),
       zlib_header_added_(false),
       gzip_footer_bytes_(0),
       possible_sdch_pass_through_(false) {
 }
 
 GZipFilter::~GZipFilter() {
   if (decoding_status_ != DECODING_UNINITIALIZED) {
-    MOZ_Z_inflateEnd(zlib_stream_.get());
+    inflateEnd(zlib_stream_.get());
   }
 }
 
 bool GZipFilter::InitDecoding(Filter::FilterType filter_type) {
   if (decoding_status_ != DECODING_UNINITIALIZED)
     return false;
 
   // Initialize zlib control block
   zlib_stream_.reset(new z_stream);
   if (!zlib_stream_.get())
@@ skipping 167 matching lines @@
     *dest_len = 0;
     return Filter::FILTER_NEED_MORE_DATA;
   }
 
   // Fill in zlib control block
   zlib_stream_.get()->next_in = bit_cast<Bytef*>(next_stream_data_);
   zlib_stream_.get()->avail_in = stream_data_len_;
   zlib_stream_.get()->next_out = bit_cast<Bytef*>(dest_buffer);
   zlib_stream_.get()->avail_out = *dest_len;
 
-  int inflate_code = MOZ_Z_inflate(zlib_stream_.get(), Z_NO_FLUSH);
+  int inflate_code = inflate(zlib_stream_.get(), Z_NO_FLUSH);
   int bytesWritten = *dest_len - zlib_stream_.get()->avail_out;
 
   Filter::FilterStatus status;
 
   switch (inflate_code) {
     case Z_STREAM_END: {
       *dest_len = bytesWritten;
 
       stream_data_len_ = zlib_stream_.get()->avail_in;
       next_stream_data_ = bit_cast<char*>(zlib_stream_.get()->next_in);
@@ skipping 39 matching lines @@
 
 bool GZipFilter::InsertZlibHeader() {
   static char dummy_head[2] = { 0x78, 0x1 };
 
   char dummy_output[4];
 
   // We only try add additional header once.
   if (zlib_header_added_)
     return false;
 
-  MOZ_Z_inflateReset(zlib_stream_.get());
+  inflateReset(zlib_stream_.get());
   zlib_stream_.get()->next_in = bit_cast<Bytef*>(&dummy_head[0]);
   zlib_stream_.get()->avail_in = sizeof(dummy_head);
   zlib_stream_.get()->next_out = bit_cast<Bytef*>(&dummy_output[0]);
   zlib_stream_.get()->avail_out = sizeof(dummy_output);
 
-  int code = MOZ_Z_inflate(zlib_stream_.get(), Z_NO_FLUSH);
+  int code = inflate(zlib_stream_.get(), Z_NO_FLUSH);
   zlib_header_added_ = true;
 
   return (code == Z_OK);
 }
 
 
 void GZipFilter::SkipGZipFooter() {
   int footer_bytes_expected = kGZipFooterSize - gzip_footer_bytes_;
   if (footer_bytes_expected > 0) {
     int footer_byte_avail = std::min(footer_bytes_expected, stream_data_len_);
     stream_data_len_ -= footer_byte_avail;
     next_stream_data_ += footer_byte_avail;
     gzip_footer_bytes_ += footer_byte_avail;
 
     if (stream_data_len_ == 0)
       next_stream_data_ = NULL;
   }
 }
 
 }  // namespace net