remove ZLIB include from SkUserConfig for how (doesn't work on mac sampleapp) but,
add it to Makefile if SKIA_PDF_SUPPORT is true
Use compile_assert (yea!)
git-svn-id: http://skia.googlecode.com/svn/trunk@643 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/Makefile b/Makefile
index 38f2891..468ff41 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@
ifeq ($(SKIA_PDF_SUPPORT),true)
DEFINES += -DSK_SUPPORT_PDF
+ DEFINES += -DSK_ZLIB_INCLUDE="<zlib.h>"
endif
# start with the core (required)
diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h
index 721f5f7..a2df745 100644
--- a/include/config/SkUserConfig.h
+++ b/include/config/SkUserConfig.h
@@ -121,7 +121,7 @@
algorithm (used in PDF generation), define SK_ZLIB_INCLUDE to be the
include path.
*/
-#define SK_ZLIB_INCLUDE <zlib.h>
+//#define SK_ZLIB_INCLUDE <zlib.h>
/* If SK_DEBUG is defined, then you can optionally define SK_SUPPORT_UNITTEST
which will run additional self-tests at startup. These can take a long time,
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 0e36c91..764e063 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1477,8 +1477,7 @@
///////////////////////////////////////////////////////////////////////////////
SkCanvas::LayerIter::LayerIter(SkCanvas* canvas, bool skipEmptyClips) {
- // need COMPILE_TIME_ASSERT
- SkASSERT(sizeof(fStorage) >= sizeof(SkDrawIter));
+ SK_COMPILE_ASSERT(sizeof(fStorage) >= sizeof(SkDrawIter), fStorage_too_small);
SkASSERT(canvas);