From 60e0fee6d4acff638ccc9670c4055aced529a7a0 Mon Sep 17 00:00:00 2001 From: bungeman Date: Wed, 26 Aug 2015 05:15:46 -0700 Subject: Remove include of stdlib.h from SkTypes.h. Unfortunately, immintrin.h (which is also included by SkTypes) includes xmmintrin.h which includes mm_malloc.h which includes stdlib.h for malloc even though, from the implementation, it is difficult to see why. Fortunately, arm_neon.h does not seem to be involved in such shenanigans, so building for Android will keep things sane. TBR=reed@google.com Doesn't change Skia API, just moves an include. Review URL: https://codereview.chromium.org/1313203003 --- src/pathops/SkPathOpsTypes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pathops/SkPathOpsTypes.cpp') diff --git a/src/pathops/SkPathOpsTypes.cpp b/src/pathops/SkPathOpsTypes.cpp index c3de93a94a..bf43c14659 100644 --- a/src/pathops/SkPathOpsTypes.cpp +++ b/src/pathops/SkPathOpsTypes.cpp @@ -160,7 +160,7 @@ int UlpsDistance(float a, float b) { return a == b ? 0 : SK_MaxS32; } // Find the difference in ULPs. - return abs(floatIntA.fSignBitInt - floatIntB.fSignBitInt); + return SkTAbs(floatIntA.fSignBitInt - floatIntB.fSignBitInt); } // cube root approximation using bit hack for 64-bit float -- cgit v1.2.3