diff options
Diffstat (limited to 'chromium/third_party/zlib')
| -rw-r--r-- | chromium/third_party/zlib/deflate.h | 4 | ||||
| -rw-r--r-- | chromium/third_party/zlib/google/compression_utils.cc | 2 | ||||
| -rw-r--r-- | chromium/third_party/zlib/google/compression_utils.h | 5 | ||||
| -rw-r--r-- | chromium/third_party/zlib/zconf.h | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/chromium/third_party/zlib/deflate.h b/chromium/third_party/zlib/deflate.h index 6838296a0e3..78ffb00a297 100644 --- a/chromium/third_party/zlib/deflate.h +++ b/chromium/third_party/zlib/deflate.h @@ -109,8 +109,8 @@ typedef struct internal_state { ulg gzindex; /* where in extra, name, or comment */ Byte method; /* can only be DEFLATED */ int last_flush; /* value of flush param for previous deflate call */ - unsigned zalign(16) crc0[4 * 5]; - /* used by deflate.c: */ + unsigned crc0[4 * 5]; + /* used by deflate.c: */ uInt w_size; /* LZ77 window size (32K by default) */ uInt w_bits; /* log2(w_size) (8..16) */ diff --git a/chromium/third_party/zlib/google/compression_utils.cc b/chromium/third_party/zlib/google/compression_utils.cc index e7be1e9df0e..dfa42a17f37 100644 --- a/chromium/third_party/zlib/google/compression_utils.cc +++ b/chromium/third_party/zlib/google/compression_utils.cc @@ -123,7 +123,7 @@ int GzipUncompressHelper(Bytef* dest, namespace compression { -bool GzipCompress(const std::string& input, std::string* output) { +bool GzipCompress(base::StringPiece input, std::string* output) { const uLongf input_size = static_cast<uLongf>(input.size()); std::vector<Bytef> compressed_data(kGzipZlibHeaderDifferenceBytes + compressBound(input_size)); diff --git a/chromium/third_party/zlib/google/compression_utils.h b/chromium/third_party/zlib/google/compression_utils.h index d496ef1af3c..a29f5b1e8d4 100644 --- a/chromium/third_party/zlib/google/compression_utils.h +++ b/chromium/third_party/zlib/google/compression_utils.h @@ -12,8 +12,9 @@ namespace compression { // Compresses the data in |input| using gzip, storing the result in |output|. -// |input| and |output| are allowed to be the same string (in-place operation). -bool GzipCompress(const std::string& input, std::string* output); +// |input| and |output| are allowed to point to the same string (in-place +// operation). +bool GzipCompress(base::StringPiece input, std::string* output); // Uncompresses the data in |input| using gzip, storing the result in |output|. // |input| and |output| are allowed to be the same string (in-place operation). diff --git a/chromium/third_party/zlib/zconf.h b/chromium/third_party/zlib/zconf.h index a7a815f575a..1843c0a44c5 100644 --- a/chromium/third_party/zlib/zconf.h +++ b/chromium/third_party/zlib/zconf.h @@ -389,6 +389,9 @@ #ifndef FAR # define FAR #endif +#ifndef far +# define far +#endif #if !defined(__MACTYPES__) typedef unsigned char Byte; /* 8 bits */ |