diff options
| author |  halcanary <halcanary@google.com> | 2016-06-07 17:21:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-07 17:21:10 -0700 |
| commit | 4dbbd04314cc0606f8d3bafe515c97e52c180f73 (patch) | |
| tree | 9c5f935ce0a61cf51d0dfe0d62f727b72f5e8481 /src/gpu/gl | |
| parent | 50bcb189f8785a599a3024d8eba4681c2e8ca37a (diff) | |
SkLeanWindows.h: #include "Windows.h" fewer places
$ git grep -l '<windows.h>' include src
include/private/SkLeanWindows.h
$ git grep -l SkLeanWindows.h | grep '\.h$'
include/ports/SkTypeface_win.h
include/utils/win/SkHRESULT.h
include/utils/win/SkTScopedComPtr.h
include/views/SkEvent.h
src/core/SkMathPriv.h
src/ports/SkTypeface_win_dw.h
src/utils/SkThreadUtils_win.h
src/utils/win/SkWGL.h
The same for `#include <intrin.h>` that was found in SkMath.h.
Those functions that needed it are moved to SkMathPriv.h.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041943002
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_chromium_compile_dbg_ng,win_chromium_compile_rel_ng
Review-Url: https://codereview.chromium.org/2041943002
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp index 1eae5d7502..5f26fdde34 100644 --- a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp +++ b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp @@ -7,11 +7,11 @@ #include "SkTypes.h" #if defined(SK_BUILD_FOR_WIN32) +#include "SkLeanWindows.h" + #include "gl/GrGLInterface.h" #include "gl/GrGLAssembleInterface.h" #include "gl/GrGLUtil.h" -#define WIN32_LEAN_AND_MEAN -#include <windows.h> class AutoLibraryUnload { public: |