AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Define LEAN_AND_MEAN and NOMINMAX for all windows builds

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2055223002

Review-Url: https://codereview.chromium.org/2055223002
This commit is contained in:
egdaniel 2016-06-10 06:42:45 -07:00 committed by Commit bot
parent 4772bd537d
commit 5dfe7bbcfd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/common_conditions.gypi
View File

@ -66,6 +66,8 @@
'_CRT_SECURE_NO_WARNINGS', '_CRT_SECURE_NO_WARNINGS',
'GR_GL_FUNCTION_TYPE=__stdcall', 'GR_GL_FUNCTION_TYPE=__stdcall',
'_HAS_EXCEPTIONS=0', '_HAS_EXCEPTIONS=0',
'WIN32_LEAN_AND_MEAN',
'NOMINMAX',
], ],
'msvs_disabled_warnings': [ 'msvs_disabled_warnings': [
4275, # An exported class was derived from a class that was not exported 4275, # An exported class was derived from a class that was not exported

1
tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
View File

@ -12,7 +12,6 @@
#include <GL/GL.h> #include <GL/GL.h>
#include "win/SkWGL.h" #include "win/SkWGL.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
namespace { namespace {