commit 0778437f480dda98bc2f50d3791d3775ac9bbc0e
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 08 16:24:07 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 08 16:24:07 2013 +0000
tree d12367be7309fa8fbac0fb8094461ebe2da04574
parent df243b8a51cebfda85d97522ac891fc75056ac6f

Update #if to #ifdef for consistency

R=mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/26495002

git-svn-id: http://skia.googlecode.com/svn/trunk/src@11653 2bbb7eff-a529-9590-31e7-b0007b416f81

core/SkPaint.cpp

diff --git a/core/SkPaint.cpp b/core/SkPaint.cpp
index 8ca9880..ea99ede 100644
--- a/core/SkPaint.cpp
+++ b/core/SkPaint.cpp
@@ -2038,7 +2038,7 @@
         asint(this->getImageFilter())) {
         flatFlags |= kHasEffects_FlatFlag;
     }
-#if SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
     if (this->getPaintOptionsAndroid() != SkPaintOptionsAndroid()) {
         flatFlags |= kHasNonDefaultPaintOptionsAndroid_FlatFlag;
     }
@@ -2101,7 +2101,7 @@
         buffer.writeFlattenable(this->getImageFilter());
         buffer.writeFlattenable(this->getAnnotation());
     }
-#if SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
     if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) {
         this->getPaintOptionsAndroid().flatten(buffer);
     }
@@ -2192,13 +2192,13 @@
         this->setImageFilter(NULL);
     }
 
-#if SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
     this->setPaintOptionsAndroid(SkPaintOptionsAndroid());
 #endif
     if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) {
         SkPaintOptionsAndroid options;
         options.unflatten(buffer);
-#if SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
         this->setPaintOptionsAndroid(options);
 #endif
     }