diff options
Diffstat (limited to 'chromium/gpu/gles2_conform_support/gles2_conform_test.gyp')
| -rw-r--r-- | chromium/gpu/gles2_conform_support/gles2_conform_test.gyp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chromium/gpu/gles2_conform_support/gles2_conform_test.gyp b/chromium/gpu/gles2_conform_support/gles2_conform_test.gyp index 4cbb35b3daa..1f23efa3c3c 100644 --- a/chromium/gpu/gles2_conform_support/gles2_conform_test.gyp +++ b/chromium/gpu/gles2_conform_support/gles2_conform_test.gyp @@ -137,12 +137,9 @@ 4018, # signed/unsigned mismatch 4101, # unreferenced local variable 4715, # not all control paths return a value + 4267, # size_t/unsigned int conversion ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': ['/UNOMINMAX'], - }, - }, + 'defines!': [ 'NOMINMAX' ], }], ['OS=="mac"', { 'defines': [ |