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

Makefile

@@ -26,6 +26,7 @@ DEFINES += -DSK_SUPPORT_LCDTEXT
 
 ifeq ($(SKIA_PDF_SUPPORT),true)
 	DEFINES += -DSK_SUPPORT_PDF
+	DEFINES += -DSK_ZLIB_INCLUDE="<zlib.h>"
 endif
 
 # start with the core (required)

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,

src/core/SkCanvas.cpp

@@ -1477,8 +1477,7 @@ void SkCanvas::drawShape(SkShape* shape) {
 ///////////////////////////////////////////////////////////////////////////////
 
 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);