diff options
| author |  egdaniel <egdaniel@google.com> | 2016-06-10 06:42:45 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-10 06:42:45 -0700 |
| commit | 5dfe7bbcfda3586142dd724fb1c715b4a549f8ee (patch) | |
| tree | 9eb309b8b48b3e8136883ffd828d238e7091c87c | |
| parent | 4772bd537d153922cd772020e4ad4820090be51a (diff) | |
Define LEAN_AND_MEAN and NOMINMAX for all windows builds
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2055223002
Review-Url: https://codereview.chromium.org/2055223002
| -rw-r--r-- | gyp/common_conditions.gypi | 2 | ||||
| -rw-r--r-- | tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 661e5d077f..b4b9890263 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -66,6 +66,8 @@ '_CRT_SECURE_NO_WARNINGS', 'GR_GL_FUNCTION_TYPE=__stdcall', '_HAS_EXCEPTIONS=0', + 'WIN32_LEAN_AND_MEAN', + 'NOMINMAX', ], 'msvs_disabled_warnings': [ 4275, # An exported class was derived from a class that was not exported diff --git a/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp b/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp index 4162b8f42d..1b482bc290 100644 --- a/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp +++ b/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp @@ -12,7 +12,6 @@ #include <GL/GL.h> #include "win/SkWGL.h" -#define WIN32_LEAN_AND_MEAN #include <windows.h> namespace { |