diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-29 06:45:22 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-29 06:45:22 +0000 |
| commit | 2be6c3e0d17574aa1e19bdf46ab4f1b6cb025944 (patch) | |
| tree | cc24ecd1776f9824607fd64f08de22a98865a60c /common_audio/signal_processing | |
| parent | acb75d6cb80107288f99d1ce0fabf86ebd8d031a (diff) | |
| download | webrtc-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
Diffstat (limited to 'common_audio/signal_processing')
| -rw-r--r-- | common_audio/signal_processing/signal_processing.gypi | 2 | ||||
| -rw-r--r-- | common_audio/signal_processing/spl_init.c | 2 |
2 files changed, 3 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); |