Index: third_party/cld/cld.gyp |
diff --git a/third_party/cld/cld.gyp b/third_party/cld/cld.gyp |
index b2db4c7bc23f6ac19e5fd0061f07d5684e1ce57c..4813f48cb09ccb3b5b31a6237ebbe7bf880c5667 100644 |
--- a/third_party/cld/cld.gyp |
+++ b/third_party/cld/cld.gyp |
@@ -101,22 +101,20 @@ |
}, |
'conditions': [ |
['OS=="win"', { |
- 'direct_dependent_settings': { |
- 'defines': [ |
- 'COMPILER_MSVC', |
- ], |
- }, |
- 'msvs_disabled_warnings': [4005, 4006, 4018, 4244, 4309, 4800], |
- }, |
- ], |
- ['OS!="win"', { |
- 'direct_dependent_settings': { |
- 'defines': [ |
- 'COMPILER_GCC', |
- ], |
- }, |
- }, |
- ], |
+ 'direct_dependent_settings': { |
+ 'defines': [ |
+ 'COMPILER_MSVC', |
+ ], |
+ }, |
+ # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int |
+ 'msvs_disabled_warnings': [4005, 4006, 4018, 4244, 4309, 4800, 4267], |
+ }, { |
+ 'direct_dependent_settings': { |
+ 'defines': [ |
+ 'COMPILER_GCC', |
+ ], |
+ }, |
+ }], |
], |
}, |
], |