diff options
| author | kulkarni.a <kulkarni.a@samsung.com> | 2014-08-26 07:13:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-26 14:15:00 +0000 |
| commit | 22ca86792d5afe3ca862578e60009d7850cd1f94 (patch) | |
| tree | cfde3cde6d3d82b657fbc3c73fa23a9bd5e8f00b | |
| parent | a07419281ba5b9ce15059a2b64b75a57fa64fbae (diff) | |
| download | chromium_src-22ca86792d5afe3ca862578e60009d7850cd1f94.zip chromium_src-22ca86792d5afe3ca862578e60009d7850cd1f94.tar.gz chromium_src-22ca86792d5afe3ca862578e60009d7850cd1f94.tar.bz2 | |
Combine MSVS warning supression codes
together in crypto.gyp
"msvs_disabled_warnings" code definition present in two place in the same 'target_name': 'crypto'.
Review URL: https://codereview.chromium.org/492963004
Cr-Commit-Position: refs/heads/master@{#291903}
| -rw-r--r-- | crypto/crypto.gyp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 3cdc151..6d60f48 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -21,9 +21,6 @@ 'defines': [ 'CRYPTO_IMPLEMENTATION', ], - 'msvs_disabled_warnings': [ - 4018, - ], 'conditions': [ [ 'os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 'dependencies': [ @@ -95,8 +92,10 @@ ], }], [ 'OS == "win"', { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], + 'msvs_disabled_warnings': [ + 4267, # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 4018, + ], }], [ 'use_openssl==1', { 'dependencies': [ |