diff options
| author |  bungeman <bungeman@google.com> | 2015-08-26 05:15:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-26 05:15:46 -0700 |
| commit | 60e0fee6d4acff638ccc9670c4055aced529a7a0 (patch) | |
| tree | 8f73b02cd0bfbb7d6d64982ed4ebd8776d4a5a28 /tests/Time.cpp | |
| parent | 8d624bd44ef9e6d4ab7b768c4cbaa41cba830eda (diff) | |
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
Diffstat (limited to 'tests/Time.cpp')
| -rw-r--r-- | tests/Time.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Time.cpp b/tests/Time.cpp index 60dcd5527c..cf4f80f9da 100644 --- a/tests/Time.cpp +++ b/tests/Time.cpp @@ -44,7 +44,7 @@ DEF_TEST(Time_GetDateTime, r) { // The westernmost timezone is -12:00. // The easternmost timezone is +14:00. - REPORTER_ASSERT(r, abs(SkToInt(dateTime.fTimeZoneMinutes)) <= 14 * 60); + REPORTER_ASSERT(r, SkTAbs(SkToInt(dateTime.fTimeZoneMinutes)) <= 14 * 60); SkString timeStamp; dateTime.toISO8601(&timeStamp); |