From 7a0ee1a7208ddfe8575d1f1179f66fda2fa99339 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 28 Apr 2009 19:38:43 +0000 Subject: Ticket #706: Merged branch vs-reorg2 into trunk: - Currently supported platforms are: Win32, WM6 std & pro, WM5 SP & PPC, WM2003 SP & PPC. - Added libpjproject into solution, this is a single 'combo' library that bundles all PJSIP libraries. - Cleaned up most of compile warnings, note that warning level of libgsmcodec has been reduced from 4 to 3. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2660 74dad513-b988-da41-8d7b-12977e46ad98 --- third_party/build/g7221/libg7221codec.vcproj | 4126 +++++++++++++++++++++-- third_party/build/gsm/libgsmcodec.vcproj | 2060 +++++++++-- third_party/build/ilbc/libilbccodec.vcproj | 1806 +++++++++- third_party/build/milenage/libmilenage.vcproj | 1644 ++++++++- third_party/build/portaudio/libportaudio.vcproj | 2476 +++++++++++++- third_party/build/resample/libresample.vcproj | 1806 +++++++++- third_party/build/speex/libspeex.vcproj | 1806 +++++++++- third_party/build/srtp/libsrtp.vcproj | 1644 ++++++++- third_party/build/srtp/srtp_config.h | 1 + third_party/g7221/common/basic_op.c | 2 +- third_party/g7221/common/basic_op.h | 4 +- third_party/ilbc/iCBSearch.c | 17 +- third_party/srtp/crypto/cipher/cipher.c | 2 +- third_party/srtp/crypto/include/cipher.h | 4 +- third_party/srtp/crypto/math/datatypes.c | 5 +- third_party/srtp/include/srtp_priv.h | 12 +- 16 files changed, 16469 insertions(+), 946 deletions(-) (limited to 'third_party') diff --git a/third_party/build/g7221/libg7221codec.vcproj b/third_party/build/g7221/libg7221codec.vcproj index 78fa52e4..2b7a3554 100644 --- a/third_party/build/g7221/libg7221codec.vcproj +++ b/third_party/build/g7221/libg7221codec.vcproj @@ -16,6 +16,18 @@ + + + + @@ -213,12 +225,12 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - - + + + + + + + + @@ -48,10 +60,9 @@ /> @@ -111,11 +121,11 @@ /> @@ -321,11 +325,11 @@ /> @@ -531,11 +529,11 @@ /> @@ -741,11 +733,11 @@ /> @@ -951,11 +937,11 @@ /> @@ -1161,11 +1141,11 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,9 +57,9 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/third_party/build/portaudio/libportaudio.vcproj b/third_party/build/portaudio/libportaudio.vcproj index 3b7fa340..d9f6a6e8 100644 --- a/third_party/build/portaudio/libportaudio.vcproj +++ b/third_party/build/portaudio/libportaudio.vcproj @@ -16,6 +16,18 @@ + + + + @@ -104,7 +116,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> + + @@ -294,7 +314,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> @@ -360,7 +380,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> + + + + + + + + + + + + + + + + + + + @@ -484,7 +570,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> @@ -550,7 +636,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> + + + + + + + + + + + + + + + + + + + + + @@ -674,7 +834,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> @@ -740,7 +900,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> @@ -864,7 +1024,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> @@ -930,7 +1090,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> + + @@ -1054,7 +1222,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> @@ -1120,7 +1288,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win" - PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC" + PreprocessorDefinitions="_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;WIN32_PLATFORM_PSPC;RPC_NO_WINDOWS_H" PrecompiledHeaderFile="" /> - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1701,7 +3297,353 @@ Name="dsound" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + @@ -2255,6 +4267,38 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + @@ -2280,6 +4324,38 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + @@ -2305,6 +4381,38 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + @@ -2330,6 +4438,38 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + @@ -2355,6 +4495,38 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + + + + + @@ -48,11 +60,10 @@ /> @@ -112,11 +122,11 @@ /> @@ -323,11 +327,11 @@ /> @@ -534,11 +532,11 @@ /> @@ -745,11 +737,11 @@ /> @@ -956,11 +942,11 @@ /> @@ -1167,11 +1147,11 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48,11 +60,10 @@ /> @@ -112,11 +122,11 @@ /> @@ -323,11 +327,11 @@ /> @@ -534,11 +532,11 @@ /> @@ -745,11 +737,11 @@ /> @@ -956,11 +942,11 @@ /> @@ -1167,11 +1147,11 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,9 +57,9 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/third_party/build/srtp/srtp_config.h b/third_party/build/srtp/srtp_config.h index d41b2eba..91c66e11 100644 --- a/third_party/build/srtp/srtp_config.h +++ b/third_party/build/srtp/srtp_config.h @@ -141,6 +141,7 @@ # pragma warning(disable:4761) // integral mismatch # pragma warning(disable:4018) // signed/unsigned mismatch # pragma warning(disable:4244) // conversion from int64 to int +# pragma warning(disable:4100) // unreferenced formal parameter #endif /* clock() */ diff --git a/third_party/g7221/common/basic_op.c b/third_party/g7221/common/basic_op.c index bf7583a7..d4c1530e 100644 --- a/third_party/g7221/common/basic_op.c +++ b/third_party/g7221/common/basic_op.c @@ -1714,7 +1714,7 @@ Word32 L_msu0 (Word32 L_var3, Word16 var1, Word16 var2) UWord32 LU_shl (UWord32 L_var1, Word16 var2) { Word16 neg_var2; - UWord32 L_var_out; + UWord32 L_var_out = 0; if (var2 <= 0) { diff --git a/third_party/g7221/common/basic_op.h b/third_party/g7221/common/basic_op.h index 93febd1f..fe64a494 100644 --- a/third_party/g7221/common/basic_op.h +++ b/third_party/g7221/common/basic_op.h @@ -15,8 +15,8 @@ #define MAX_16 (Word16)0x7fff #define MIN_16 (Word16)(pj_uint16_t)0x8000 -#define UMAX_32 (Word32)0xffffffffL -#define UMIN_32 (Word32)0x00000000L +#define UMAX_32 (UWord32)0xffffffffL +#define UMIN_32 (UWord32)0x00000000L /*___________________________________________________________________________ | | diff --git a/third_party/ilbc/iCBSearch.c b/third_party/ilbc/iCBSearch.c index dfbc50b7..e0442bf0 100644 --- a/third_party/ilbc/iCBSearch.c +++ b/third_party/ilbc/iCBSearch.c @@ -234,22 +234,20 @@ /* unrestricted search */ - if (CB_RESRANGE == -1) { +# if CB_RESRANGE == -1 + //if (CB_RESRANGE == -1) { sInd=0; eInd=range-1; sIndAug=20; eIndAug=39; - } - - - - + //} +# else /* restricted search around best index from first codebook section */ - else { + //else { /* Initialize search indices */ sIndAug=0; eIndAug=0; @@ -307,7 +305,10 @@ eInd = range; } } - } + + //} +# endif /* CB_RESRANGE == -1 */ + /* search of higher codebook section */ diff --git a/third_party/srtp/crypto/cipher/cipher.c b/third_party/srtp/crypto/cipher/cipher.c index b5ef1645..489a52d9 100644 --- a/third_party/srtp/crypto/cipher/cipher.c +++ b/third_party/srtp/crypto/cipher/cipher.c @@ -269,7 +269,7 @@ cipher_type_self_test(const cipher_type_t *ct) { for (j=0; j < NUM_RAND_TESTS; j++) { unsigned length; - int plaintext_len; + unsigned plaintext_len; uint8_t key[MAX_KEY_LEN]; uint8_t iv[MAX_KEY_LEN]; diff --git a/third_party/srtp/crypto/include/cipher.h b/third_party/srtp/crypto/include/cipher.h index 96ee9dc3..f485660c 100644 --- a/third_party/srtp/crypto/include/cipher.h +++ b/third_party/srtp/crypto/include/cipher.h @@ -127,9 +127,9 @@ typedef struct cipher_test_case_t { int key_length_octets; /* octets in key */ uint8_t *key; /* key */ uint8_t *idx; /* packet index */ - int plaintext_length_octets; /* octets in plaintext */ + unsigned int plaintext_length_octets; /* octets in plaintext */ uint8_t *plaintext; /* plaintext */ - int ciphertext_length_octets; /* octets in plaintext */ + unsigned int ciphertext_length_octets; /* octets in plaintext */ uint8_t *ciphertext; /* ciphertext */ struct cipher_test_case_t *next_test_case; /* pointer to next testcase */ } cipher_test_case_t; diff --git a/third_party/srtp/crypto/math/datatypes.c b/third_party/srtp/crypto/math/datatypes.c index 61bf34fe..331aed8b 100644 --- a/third_party/srtp/crypto/math/datatypes.c +++ b/third_party/srtp/crypto/math/datatypes.c @@ -149,10 +149,9 @@ hex_char_to_nibble(uint8_t c) { case ('E'): return 0xe; case ('f'): return 0xf; case ('F'): return 0xf; - default: return -1; /* this flags an error */ + default: break; /* this flags an error */ } - /* NOTREACHED */ - return -1; /* this keeps compilers from complaining */ + return -1; } int diff --git a/third_party/srtp/include/srtp_priv.h b/third_party/srtp/include/srtp_priv.h index de273ab3..9214a650 100644 --- a/third_party/srtp/include/srtp_priv.h +++ b/third_party/srtp/include/srtp_priv.h @@ -59,6 +59,11 @@ * is not identical) */ +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable:4214) // bit field types other than int +#endif + #ifndef WORDS_BIGENDIAN /* @@ -67,7 +72,6 @@ * "unsigned char", but doing so causes the MS compiler to not * fully pack the bit fields. */ - typedef struct { unsigned char cc:4; /* CSRC count */ unsigned char x:1; /* header extension flag */ @@ -95,6 +99,7 @@ typedef struct { } srtp_hdr_t; #endif + typedef struct { uint16_t profile_specific; /* profile-specific info */ @@ -157,6 +162,11 @@ typedef struct { #endif +#ifdef _MSC_VER +# pragma warning( pop ) +#endif + + /* * the following declarations are libSRTP internal functions */ -- cgit v1.2.3