Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: skia/config/SkUserConfig.h

Issue 11632002: Use generated shim headers for zlib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/shim_headers.gypi ('K') | « net/spdy/spdy_framer.cc ('k') | third_party/zlib/contrib/minizip/ioapi.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/config/SkUserConfig.h
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index e09dd4b10ce6ebd248ab46bfdf4f5ebb5fccec59..a0cb64f941cead079b8134a2a223437debb39834 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.
« build/shim_headers.gypi ('K') | « net/spdy/spdy_framer.cc ('k') | third_party/zlib/contrib/minizip/ioapi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698