diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 18:39:27 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 18:39:27 +0000 |
| commit | aa0b70e0b33e5079243a0069615c63e1f4171358 (patch) | |
| tree | 16cea6a5640bd38aaed94b01528957050af2e26d /net | |
| parent | ec86bea44a17187127f3b5a07524dc533d07705c (diff) | |
| download | chromium_src-aa0b70e0b33e5079243a0069615c63e1f4171358.zip chromium_src-aa0b70e0b33e5079243a0069615c63e1f4171358.tar.gz chromium_src-aa0b70e0b33e5079243a0069615c63e1f4171358.tar.bz2 | |
Fix build with use_system_zlib=1
http://codereview.chromium.org/469018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/flip/flip_framer.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/flip/flip_framer.cc b/net/flip/flip_framer.cc index 7dc93ac..69d25c8 100644 --- a/net/flip/flip_framer.cc +++ b/net/flip/flip_framer.cc @@ -9,7 +9,11 @@ #include "flip_frame_builder.h" #include "flip_bitmasks.h" +#if defined(USE_SYSTEM_ZLIB) +#include <zlib.h> +#else #include "third_party/zlib/zlib.h" +#endif namespace flip { |