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 /tools/skpmaker.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 'tools/skpmaker.cpp')
| -rw-r--r-- | tools/skpmaker.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/skpmaker.cpp b/tools/skpmaker.cpp index 03f720f392..0e378ed088 100644 --- a/tools/skpmaker.cpp +++ b/tools/skpmaker.cpp @@ -16,6 +16,8 @@ #include "SkScalar.h" #include "SkStream.h" +#include <stdlib.h> + // Flags used by this file, alphabetically: DEFINE_int32(blue, 128, "Value of blue color channel in image, 0-255."); DEFINE_int32(border, 4, "Width of the black border around the image."); |