summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-01-29 06:45:22 +0000
committerandrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-01-29 06:45:22 +0000
commit2be6c3e0d17574aa1e19bdf46ab4f1b6cb025944 (patch)
treecc24ecd1776f9824607fd64f08de22a98865a60c
parentacb75d6cb80107288f99d1ce0fabf86ebd8d031a (diff)
downloadwebrtc-2be6c3e0d17574aa1e19bdf46ab4f1b6cb025944.tar.gz
Fix webrtc compilation errors for Chrome Win64
Mostly disabling warnings in the gyp files. BUG=1348 BUG=http://crbug.com/166496 BUG=http://crbug.com/167187 Review URL: https://webrtc-codereview.appspot.com/1063011 Patch from Justin Schuh <jschuh@chromium.org>. git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3423 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--common_audio/signal_processing/signal_processing.gypi2
-rw-r--r--common_audio/signal_processing/spl_init.c2
-rw-r--r--common_video/common_video.gyp2
-rw-r--r--modules/audio_processing/audio_processing.gypi2
-rw-r--r--modules/bitrate_controller/bitrate_controller.gypi2
-rw-r--r--modules/media_file/source/media_file.gypi2
-rw-r--r--modules/rtp_rtcp/source/rtp_rtcp.gypi2
-rw-r--r--system_wrappers/source/system_wrappers.gyp2
-rw-r--r--video_engine/video_engine_core.gypi2
9 files changed, 17 insertions, 1 deletions
diff --git a/common_audio/signal_processing/signal_processing.gypi b/common_audio/signal_processing/signal_processing.gypi
index 929569db..f6c6e735 100644
--- a/common_audio/signal_processing/signal_processing.gypi
+++ b/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/common_audio/signal_processing/spl_init.c b/common_audio/signal_processing/spl_init.c
index db21e404..5d243bb8 100644
--- a/common_audio/signal_processing/spl_init.c
+++ b/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/common_video/common_video.gyp b/common_video/common_video.gyp
index d8f2a3f5..36e2ee5b 100644
--- a/common_video/common_video.gyp
+++ b/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/modules/audio_processing/audio_processing.gypi b/modules/audio_processing/audio_processing.gypi
index a9d8438e..5ca1cc20 100644
--- a/modules/audio_processing/audio_processing.gypi
+++ b/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/modules/bitrate_controller/bitrate_controller.gypi b/modules/bitrate_controller/bitrate_controller.gypi
index a8ca938d..03334bd3 100644
--- a/modules/bitrate_controller/bitrate_controller.gypi
+++ b/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/modules/media_file/source/media_file.gypi b/modules/media_file/source/media_file.gypi
index 084a0235..797657a0 100644
--- a/modules/media_file/source/media_file.gypi
+++ b/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/modules/rtp_rtcp/source/rtp_rtcp.gypi b/modules/rtp_rtcp/source/rtp_rtcp.gypi
index 41305a68..83e320f9 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp.gypi
+++ b/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/system_wrappers/source/system_wrappers.gyp b/system_wrappers/source/system_wrappers.gyp
index 70ed5021..b0903b2d 100644
--- a/system_wrappers/source/system_wrappers.gyp
+++ b/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/video_engine/video_engine_core.gypi b/video_engine/video_engine_core.gypi
index 4956b4d0..8f28ef6a 100644
--- a/video_engine/video_engine_core.gypi
+++ b/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': [