4dbbd04314
$ 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
35 lines
761 B
C
35 lines
761 B
C
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#ifndef SkLeanWindows_DEFINED
|
|
#define SkLeanWindows_DEFINED
|
|
|
|
#include "SkTypes.h"
|
|
|
|
#ifdef SK_BUILD_FOR_WIN
|
|
# ifndef WIN32_LEAN_AND_MEAN
|
|
# define WIN32_LEAN_AND_MEAN
|
|
# define WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
|
|
# endif
|
|
# ifndef NOMINMAX
|
|
# define NOMINMAX
|
|
# define NOMINMAX_WAS_LOCALLY_DEFINED
|
|
# endif
|
|
#
|
|
# include <windows.h>
|
|
#
|
|
# ifdef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
|
|
# undef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
|
|
# undef WIN32_LEAN_AND_MEAN
|
|
# endif
|
|
# ifdef NOMINMAX_WAS_LOCALLY_DEFINED
|
|
# undef NOMINMAX_WAS_LOCALLY_DEFINED
|
|
# undef NOMINMAX
|
|
# endif
|
|
#endif
|
|
|
|
#endif // SkLeanWindows_DEFINED
|