Index: include/core/SkPostConfig.h |
diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h |
index 330454cbead8b6f51e4a4fb308047c5e75f75298..ad0098f4294d11dd0a0519f8572adcb60b1de378 100644 |
--- a/include/core/SkPostConfig.h |
+++ b/include/core/SkPostConfig.h |
@@ -88,12 +88,6 @@ |
# endif |
#endif |
-#if defined(SK_ZLIB_INCLUDE) && defined(SK_SYSTEM_ZLIB) |
-# error "cannot define both SK_ZLIB_INCLUDE and SK_SYSTEM_ZLIB" |
-#elif defined(SK_ZLIB_INCLUDE) || defined(SK_SYSTEM_ZLIB) |
-# define SK_HAS_ZLIB |
-#endif |
- |
/////////////////////////////////////////////////////////////////////////////// |
#ifndef SkNEW |