ARM Skia NEON patches - 04 - Clean SkFixed / SkLONGLONG

src/core/SkMath.cpp

Index: src/core/SkMath.cpp
diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp
index 0efedd727b08d87562fd9105422b3e14da39d533..b473af0ac0a6b42dc7c6e9b9d1bf9eed694f9eb1 100644
--- a/src/core/SkMath.cpp
+++ b/src/core/SkMath.cpp
@@ -131,8 +131,6 @@ SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) {
     tmp.setMul(a, b);
     tmp.shiftRight(16);
     return tmp.fLo;
-#elif defined(SkLONGLONG)

[djsollen, 2013/07/15 12:16:12]

in include/core/SkPostConfig.h we define SkLONGLONG on both windows and mac.

[kevin.petit.not.used.account, 2013/07/15 13:51:24]

Yes but in this case, and unless I've missed something, the code
at include/core/SkFixed.h:175 is used. The comment just above may
also be worth a look.

-    return static_cast<SkFixed>((SkLONGLONG)a * b >> 16);
 #else
     int sa = SkExtractSign(a);
     int sb = SkExtractSign(b);
@@ -156,8 +154,6 @@ SkFract SkFractMul_portable(SkFract a, SkFract b) {
     Sk64 tmp;
     tmp.setMul(a, b);
     return tmp.getFract();
-#elif defined(SkLONGLONG)
-    return static_cast<SkFract>((SkLONGLONG)a * b >> 30);
 #else
     int sa = SkExtractSign(a);
     int sb = SkExtractSign(b);