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 --- tools/lua/lua_app.cpp | 2 ++ tools/lua/lua_pictures.cpp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tools/lua') diff --git a/tools/lua/lua_app.cpp b/tools/lua/lua_app.cpp index 023ddaeaca..f24570a829 100644 --- a/tools/lua/lua_app.cpp +++ b/tools/lua/lua_app.cpp @@ -11,6 +11,8 @@ #include "SkData.h" #include "SkOSFile.h" +#include + extern "C" { #include "lua.h" #include "lualib.h" diff --git a/tools/lua/lua_pictures.cpp b/tools/lua/lua_pictures.cpp index d579f2e630..315e4bfb89 100644 --- a/tools/lua/lua_pictures.cpp +++ b/tools/lua/lua_pictures.cpp @@ -17,6 +17,8 @@ #include "SkOSFile.h" #include "SkImageDecoder.h" +#include + extern "C" { #include "lua.h" #include "lualib.h" -- cgit v1.2.3