diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 21:57:39 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 21:57:39 +0000 |
| commit | 0792119e66d4e4ed93a47903c95301a41d194a19 (patch) | |
| tree | 2f103aeae8c9b077c5f9d75dbcdc19f92b4fe8fa /webkit/tools | |
| parent | 7897ca14f981c2afe312e5356b3c324242998568 (diff) | |
| download | chromium_src-0792119e66d4e4ed93a47903c95301a41d194a19.zip chromium_src-0792119e66d4e4ed93a47903c95301a41d194a19.tar.gz chromium_src-0792119e66d4e4ed93a47903c95301a41d194a19.tar.bz2 | |
Linux: fix compilation with system libpng and system zlib.
1. This is fixing a real compile issue with the following
gyp switches: -Duse_system_libpng=1 -Duse_system_zlib=1
2. The bundled libpng header #includes zlib header, the system
one doesn't (necessarily) do so.
3. We need updated gyp dependencies to have pre-processor symbols
like USE_SYSTEM_LIBPNG, USE_SYSTEM_ZLIB (and without those
the compile is also going to fail when bundled libs are removed).
This is upstreaming a Gentoo Linux patch.
BUG=none
Review URL: http://codereview.chromium.org/9316046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/simple_clipboard_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc index c7bb959..56e4431 100644 --- a/webkit/tools/test_shell/simple_clipboard_impl.cc +++ b/webkit/tools/test_shell/simple_clipboard_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,11 @@ #include "base/string16.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" +#if defined(USE_SYSTEM_ZLIB) +#include <zlib.h> +#else #include "third_party/zlib/zlib.h" +#endif #include "ui/base/clipboard/clipboard.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/size.h" |