summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 22:42:25 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 22:42:25 +0000
commit056a8485be5325304fc2c28ab0cecca98e19d687 (patch)
tree7cf3bb053f2f4fbd285b26d4c8dc578d0939a0f0 /skia
parenta849323e1e44905e48c646b29872995209a9e08a (diff)
downloadchromium_src-056a8485be5325304fc2c28ab0cecca98e19d687.zip
chromium_src-056a8485be5325304fc2c28ab0cecca98e19d687.tar.gz
chromium_src-056a8485be5325304fc2c28ab0cecca98e19d687.tar.bz2
Use generated shim headers for zlib.
BUG=165264 Review URL: https://codereview.chromium.org/11632002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/config/SkUserConfig.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index e09dd4b..a0cb64f 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -110,11 +110,7 @@
include path.
*/
//#define SK_ZLIB_INCLUDE <zlib.h>
-#if defined(USE_SYSTEM_ZLIB)
-#define SK_ZLIB_INCLUDE <zlib.h>
-#else
#define SK_ZLIB_INCLUDE "third_party/zlib/zlib.h"
-#endif
/* Define this to allow PDF scalars above 32k. The PDF/A spec doesn't allow
them, but modern PDF interpreters should handle them just fine.