aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkFixed.h
diff options
context:
space:
mode:
authorGravatar caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-20 15:45:41 +0000
committerGravatar caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-20 15:45:41 +0000
commit867cbd8bc29371a360194aed648c4d43307b0639 (patch)
treea8304af47996be63595ff3659546f82772230d6b /include/core/SkFixed.h
parentdb545aec7267b10f1cb925204862f7e16753b724 (diff)
first cut at making iOS work
Replace __arm__ with SK_CPU_ARM add support for iOS simulator and device fix const warning in iOSSampleApp update gyp files https://code.google.com/p/skia/issues/detail?id=900 tracks fixing missing arm assembly Review URL: https://codereview.appspot.com/6552045 git-svn-id: http://skia.googlecode.com/svn/trunk@5606 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkFixed.h')
-rw-r--r--include/core/SkFixed.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkFixed.h b/include/core/SkFixed.h
index c15d469d8d..0f8f758887 100644
--- a/include/core/SkFixed.h
+++ b/include/core/SkFixed.h
@@ -190,7 +190,7 @@ inline bool SkFixedNearlyZero(SkFixed x, SkFixed tolerance = SK_FixedNearlyZero)
#define SkFixedSquare(a) SkFixedSquare_longlong(a)
#endif
-#if defined(__arm__) && !defined(__thumb__)
+#if defined(SK_CPU_ARM) && !defined(__thumb__)
/* This guy does not handle NaN or other obscurities, but is faster than
than (int)(x*65536) when we only have software floats
*/