diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 17:01:52 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 17:01:52 +0000 |
| commit | e13845b800805418430f616c5221de2af5fbba47 (patch) | |
| tree | 63dde4372e59d1f069027fcccfd49463d4d7c877 /ui | |
| parent | e0132d8990406c3b855624c028299d77d3611d71 (diff) | |
| download | chromium_src-e13845b800805418430f616c5221de2af5fbba47.zip chromium_src-e13845b800805418430f616c5221de2af5fbba47.tar.gz chromium_src-e13845b800805418430f616c5221de2af5fbba47.tar.bz2 | |
Linux: include zlib headers to avoid a breakage with libpng-1.5
See http://bugs.gentoo.org/show_bug.cgi?id=365841
BUG=none
Review URL: http://codereview.chromium.org/6969030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/codec/png_codec.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc index 829faa1..61de968 100644 --- a/ui/gfx/codec/png_codec.cc +++ b/ui/gfx/codec/png_codec.cc @@ -18,6 +18,12 @@ extern "C" { #else #include "third_party/libpng/png.h" #endif + +#if defined(USE_SYSTEM_ZLIB) +#include <zlib.h> +#else +#include "third_party/zlib/zlib.h" +#endif } namespace gfx { |