diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-08 16:43:27 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-08 16:43:27 +0000 |
| commit | d2fec012063ade5737c7075758574137e4d18410 (patch) | |
| tree | c146eeb0aa3306931c044a569d5905698d91fef4 /o3d/import/cross/gz_compressor.cc | |
| parent | d1d12f3e73ab60a2bea0ad380cc227dbd165c3a6 (diff) | |
| download | chromium_src-d2fec012063ade5737c7075758574137e4d18410.zip chromium_src-d2fec012063ade5737c7075758574137e4d18410.tar.gz chromium_src-d2fec012063ade5737c7075758574137e4d18410.tar.bz2 | |
This fixes a bunch of warnings that are in our code, in order for the GYP build to succeed.
Review URL: http://codereview.chromium.org/118346
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import/cross/gz_compressor.cc')
| -rw-r--r-- | o3d/import/cross/gz_compressor.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/o3d/import/cross/gz_compressor.cc b/o3d/import/cross/gz_compressor.cc index 2352405..6c853e1 100644 --- a/o3d/import/cross/gz_compressor.cc +++ b/o3d/import/cross/gz_compressor.cc @@ -39,7 +39,7 @@ #include <assert.h> #include "import/cross/memory_buffer.h" #include "import/cross/memory_stream.h" -#include "third_party/zlib/files/zutil.h" +#include "zutil.h" const size_t kChunkSize = 16384; @@ -104,7 +104,7 @@ int GzCompressor::CompressBytes(MemoryReadStream *stream, int result = Z_OK; // Don't try to read more than our stream has - int remaining = stream->GetRemainingByteCount(); + size_t remaining = stream->GetRemainingByteCount(); if (bytes_to_process > remaining) { return Z_STREAM_ERROR; } |