aboutsummaryrefslogtreecommitdiffstats
path: root/include/core/SkMath.h
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-09-01 08:31:25 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-09-01 08:31:25 -0700
commit396008a4fc955119355c57bc41a3d9119c8e22d6 (patch)
tree90c6cedafddf636a171d0e049726007276a6017b /include/core/SkMath.h
parent54f19651a60d8a12f4a808ef8923e23ce41c05f0 (diff)
parentad0afb3c8552032c3065cea4a98ed1ec09d51101 (diff)
downloadexternal_skia-396008a4fc955119355c57bc41a3d9119c8e22d6.zip
external_skia-396008a4fc955119355c57bc41a3d9119c8e22d6.tar.gz
external_skia-396008a4fc955119355c57bc41a3d9119c8e22d6.tar.bz2
merge from open-source master
Diffstat (limited to 'include/core/SkMath.h')
-rw-r--r--include/core/SkMath.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index cf79e53..3f3c660 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -164,7 +164,7 @@ static inline int SkNextLog2(uint32_t value) {
*/
#if defined(__arm__) \
&& !defined(__thumb__) \
- && !defined(__ARM_ARCH_4__) \
+ && !defined(__ARM_ARCH_4T__) \
&& !defined(__ARM_ARCH_5T__)
static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
SkASSERT((int16_t)x == x);