Index: tools/gn/secondary/third_party/snappy/BUILD.gn |
diff --git a/tools/gn/secondary/third_party/snappy/BUILD.gn b/tools/gn/secondary/third_party/snappy/BUILD.gn |
index 5a0313fb3a6a9cce9530338a58b6f6119dd3f117..705cb8aa2b8d7ffea3714220a5cfc7f6b04f048e 100644 |
--- a/tools/gn/secondary/third_party/snappy/BUILD.gn |
+++ b/tools/gn/secondary/third_party/snappy/BUILD.gn |
@@ -33,22 +33,14 @@ static_library("snappy") { |
configs += [ "//build/config/compiler:no_chromium_code" ] |
direct_dependent_configs = [ ":snappy_config" ] |
- #['OS=="win"', { |
- # # Signed/unsigned comparison |
- # 'msvs_disabled_warnings': [ |
- # # https://code.google.com/p/snappy/issues/detail?id=71 |
- # 4018, |
- # # https://code.google.com/p/snappy/issues/detail?id=75 |
- # 4267, |
- # ], |
- # }], |
- # ['clang == 1', { |
- # # snappy-stubs-internal.h unapologetically has: using namespace std |
- # # https://code.google.com/p/snappy/issues/detail?id=70 |
- # 'xcode_settings': { |
- # 'WARNING_CFLAGS!': [ '-Wheader-hygiene' ], |
- # }, |
- # 'cflags!': [ '-Wheader-hygiene' ], |
- # }], |
- # ], |
+ if (is_clang) { |
+ # snappy-stubs-internal.h unapologetically has: using namespace std |
+ # https://code.google.com/p/snappy/issues/detail?id=70 |
+ configs -= [ "//build/config/clang:extra_warnings" ] |
+ } |
+ |
+ if (is_win) { |
+ # https://code.google.com/p/snappy/issues/detail?id=75 |
+ cflags = [ "/wd4267" ] # Conversion from size_t to 'type'. |
+ } |
} |