diff --git a/webrtc/common_audio/signal_processing/signal_processing.gypi b/webrtc/common_audio/signal_processing/signal_processing.gypi index 929569db4c..f6c6e73518 100644 --- a/webrtc/common_audio/signal_processing/signal_processing.gypi +++ b/webrtc/common_audio/signal_processing/signal_processing.gypi @@ -85,6 +85,8 @@ ], }], ], + # Ignore warning on shift operator promotion. + 'msvs_disabled_warnings': [ 4334, ], }, # spl ], # targets 'conditions': [ diff --git a/webrtc/common_audio/signal_processing/spl_init.c b/webrtc/common_audio/signal_processing/spl_init.c index db21e40434..5d243bb8d5 100644 --- a/webrtc/common_audio/signal_processing/spl_init.c +++ b/webrtc/common_audio/signal_processing/spl_init.c @@ -100,7 +100,7 @@ static void once(void (*func)(void)) { * InterlockedCompareExchangePointer) to avoid issues similar to * http://code.google.com/p/webm/issues/detail?id=467. */ - static CRITICAL_SECTION lock = {(void *)-1, -1, 0, 0, 0, 0}; + static CRITICAL_SECTION lock = {(void *)((size_t)-1), -1, 0, 0, 0, 0}; static int done = 0; EnterCriticalSection(&lock); diff --git a/webrtc/common_video/common_video.gyp b/webrtc/common_video/common_video.gyp index d8f2a3f569..36e2ee5b0c 100644 --- a/webrtc/common_video/common_video.gyp +++ b/webrtc/common_video/common_video.gyp @@ -66,6 +66,8 @@ 'plane.h', 'plane.cc', ], + # Silence jpeg struct padding warnings. + 'msvs_disabled_warnings': [ 4324, ], }, ], # targets 'conditions': [ diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi index a9d8438e05..5ca1cc20e9 100644 --- a/webrtc/modules/audio_processing/audio_processing.gypi +++ b/webrtc/modules/audio_processing/audio_processing.gypi @@ -122,6 +122,8 @@ 'dependencies': ['audio_processing_neon',], }], ], + # TODO(jschuh): Bug 1348: fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], }, ], 'conditions': [ diff --git a/webrtc/modules/bitrate_controller/bitrate_controller.gypi b/webrtc/modules/bitrate_controller/bitrate_controller.gypi index a8ca938de8..03334bd37b 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller.gypi +++ b/webrtc/modules/bitrate_controller/bitrate_controller.gypi @@ -30,6 +30,8 @@ 'send_side_bandwidth_estimation.cc', 'send_side_bandwidth_estimation.h', ], + # TODO(jschuh): Bug 1348: fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], }, ], # targets diff --git a/webrtc/modules/media_file/source/media_file.gypi b/webrtc/modules/media_file/source/media_file.gypi index 084a0235bd..797657a0ca 100644 --- a/webrtc/modules/media_file/source/media_file.gypi +++ b/webrtc/modules/media_file/source/media_file.gypi @@ -38,6 +38,8 @@ 'media_file_utility.cc', 'media_file_utility.h', ], # source + # TODO(jschuh): Bug 1348: fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], }, ], # targets 'conditions': [ diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi b/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi index 41305a6840..83e320f91c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi @@ -91,6 +91,8 @@ # Mocks '../mocks/mock_rtp_rtcp.h', ], # source + # TODO(jschuh): Bug 1348: fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], }, ], } diff --git a/webrtc/system_wrappers/source/system_wrappers.gyp b/webrtc/system_wrappers/source/system_wrappers.gyp index 70ed50213a..b0903b2d02 100644 --- a/webrtc/system_wrappers/source/system_wrappers.gyp +++ b/webrtc/system_wrappers/source/system_wrappers.gyp @@ -187,6 +187,8 @@ ], }], ], + # Ignore warning on shift operator promotion. + 'msvs_disabled_warnings': [ 4334, ], }, ], # targets 'conditions': [ diff --git a/webrtc/video_engine/video_engine_core.gypi b/webrtc/video_engine/video_engine_core.gypi index 4956b4d07b..8f28ef6afa 100644 --- a/webrtc/video_engine/video_engine_core.gypi +++ b/webrtc/video_engine/video_engine_core.gypi @@ -137,6 +137,8 @@ 'vie_sender.cc', 'vie_sync_module.cc', ], # source + # TODO(jschuh): Bug 1348: fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], }, ], # targets 'conditions': [