diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 18:48:45 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 18:48:45 +0000 |
| commit | 97199591735ab2316737205ab9dc1e25c62768f2 (patch) | |
| tree | adedcfb6c9549f057cfe68b136b4bff5c89ddf4a /net/base/gzip_header.cc | |
| parent | 0bcd33eacb640e709f36abf3f8d3e88ecd34efef (diff) | |
| download | chromium_src-97199591735ab2316737205ab9dc1e25c62768f2.zip chromium_src-97199591735ab2316737205ab9dc1e25c62768f2.tar.gz chromium_src-97199591735ab2316737205ab9dc1e25c62768f2.tar.bz2 | |
Linux: add GYP flag to build with system zlib.
This follows the general style of r21663, which we agreed was the way
to do this.
Note that, currently, one cannot build with system zlib on a 64-bit
system since it's missing a symlink to libz.so in /usr/lib32.
http://codereview.chromium.org/164027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/gzip_header.cc')
| -rw-r--r-- | net/base/gzip_header.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/base/gzip_header.cc b/net/base/gzip_header.cc index c5630a6..5b10a71 100644 --- a/net/base/gzip_header.cc +++ b/net/base/gzip_header.cc @@ -4,8 +4,13 @@ #include "net/base/gzip_header.h" -#include "base/logging.h" +#if defined(USE_SYSTEM_ZLIB) +#include <zlib.h> +#else #include "third_party/zlib/zlib.h" // for Z_DEFAULT_COMPRESSION +#endif + +#include "base/logging.h" const uint8 GZipHeader::magic[] = { 0x1f, 0x8b }; |