FS-7966: fix more msvc 2015 build warnings.

diff --git a/libs/srtp/libsrtp.2015.vcxproj b/libs/srtp/libsrtp.2015.vcxproj
index f3cb9ebf65e64ae1a75be44cb4c15fbe693d5a5e..36053171096ec9de9e5f69c1bfa97b6829785bd4 100644 (file)
--- a/libs/srtp/libsrtp.2015.vcxproj
+++ b/libs/srtp/libsrtp.2015.vcxproj
@@ -148,7 +148,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>4305;4100;4244;4389;4018;4013;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4389;4013;4018;4702;4305;4100;4244;4389;4018;4013;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
@@ -169,7 +169,7 @@
       <StructMemberAlignment>Default</StructMemberAlignment>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>4305;4100;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4389;4013;4018;4702;4305;4100;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -184,7 +184,7 @@
       <StructMemberAlignment>Default</StructMemberAlignment>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>4305;4100;4244;4389;4018;4013;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4389;4013;4018;4702;4305;4100;4244;4389;4018;4013;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
@@ -202,7 +202,7 @@
       <StructMemberAlignment>Default</StructMemberAlignment>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>4305;4100;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4389;4013;4018;4702;4305;4100;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Dll|Win32'">\r
@@ -232,7 +232,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4389;4013;4018;4702;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -275,7 +275,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4389;4013;4018;4702;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -313,7 +313,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4389;4013;4018;4702;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -348,7 +348,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4389;4013;4018;4702;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r

diff --git a/libs/win32/Download PCRE.2015.vcxproj b/libs/win32/Download PCRE.2015.vcxproj
index 34e2ba97fea3233402aa0543d8847ee143ef79df..8c31b2c54944ad5f93665a6f3214ed124f882155 100644 (file)
--- a/libs/win32/Download PCRE.2015.vcxproj
+++ b/libs/win32/Download PCRE.2015.vcxproj
@@ -15,6 +15,7 @@
     <ProjectGuid>{B1E7E876-347F-4DC9-9BEA-D1AFBD9DFF8A}</ProjectGuid>\r
     <RootNamespace>Download PCRE</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -40,8 +41,8 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\CURL\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\CURL\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\PCRE\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\PCRE\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <BuildLog>\r

diff --git a/libs/win32/Download SPEEX.2015.vcxproj b/libs/win32/Download SPEEX.2015.vcxproj
index 5cfa69db82ea6d276f15ca36911ba66716fd2b98..751b919cac7806247a0694581e2a70b471568272 100644 (file)
--- a/libs/win32/Download SPEEX.2015.vcxproj
+++ b/libs/win32/Download SPEEX.2015.vcxproj
@@ -15,6 +15,7 @@
     <ProjectGuid>{1BDAB935-27DC-47E3-95EA-17E024D39C31}</ProjectGuid>\r
     <RootNamespace>Download SPEEX</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -40,8 +41,8 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\CURL\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\CURL\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\SPEEX\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\SPEEX\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <BuildLog>\r

diff --git a/libs/win32/Download SQLITE.2015.vcxproj b/libs/win32/Download SQLITE.2015.vcxproj
index cc864b30144469f3e17324efe88740511a2bc85e..e1e0eee570047ccdb05f73042173ae29986d7128 100644 (file)
--- a/libs/win32/Download SQLITE.2015.vcxproj
+++ b/libs/win32/Download SQLITE.2015.vcxproj
@@ -15,6 +15,7 @@
     <ProjectGuid>{97D25665-34CD-4E0C-96E7-88F0795B8883}</ProjectGuid>\r
     <RootNamespace>Download SQLITE</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -40,8 +41,8 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\CURL\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\CURL\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\SQLITE\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\SQLITE\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <BuildLog>\r

diff --git a/libs/win32/apr/libapr.2015.vcxproj b/libs/win32/apr/libapr.2015.vcxproj
index 66565522753fdd371b826cbf795e8e86ad9bad12..d2e6efd6566eee85f8ad272f5b87fe907c155b28 100644 (file)
--- a/libs/win32/apr/libapr.2015.vcxproj
+++ b/libs/win32/apr/libapr.2015.vcxproj
@@ -121,7 +121,7 @@ xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4311;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4311;4312;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -194,7 +194,7 @@ xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4311;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4311;4312;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r

diff --git a/libs/win32/libcbt/libcbt.2015.vcxproj b/libs/win32/libcbt/libcbt.2015.vcxproj
index c39686a9335d47f2304ada49f380b5a98745094c..1f6f67d5c05fb409e6484e133336ad65cb8338a6 100644 (file)
--- a/libs/win32/libcbt/libcbt.2015.vcxproj
+++ b/libs/win32/libcbt/libcbt.2015.vcxproj
@@ -90,7 +90,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <SDLCheck>true</SDLCheck>\r
       <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>\r
-      <DisableSpecificWarnings>4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4311;4302;4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -108,7 +108,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <SDLCheck>true</SDLCheck>\r
       <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>\r
-      <DisableSpecificWarnings>4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4311;4302;4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -128,7 +128,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <SDLCheck>true</SDLCheck>\r
       <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>\r
-      <DisableSpecificWarnings>4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4311;4302;4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -150,7 +150,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <SDLCheck>true</SDLCheck>\r
       <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>\r
-      <DisableSpecificWarnings>4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4311;4302;4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r

diff --git a/libs/win32/libshout/shout/shout.h b/libs/win32/libshout/shout/shout.h
index 1c2b4c7f63b7d5c1b6ef3afb2bbea8624889d23f..30473e6f8d1d07cf58996cb32bc9741cd711b438 100644 (file)
--- a/libs/win32/libshout/shout/shout.h
+++ b/libs/win32/libshout/shout/shout.h
@@ -36,7 +36,7 @@
 #endif
 #endif // VC8+
 # endif
-#ifndef __MINGW32__
+#if  !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER < 1900)
 #define va_copy(ap1, ap2) memcpy(&ap1, &ap2, sizeof(va_list))
 #endif
 

diff --git a/libs/win32/mpg123/libmpg123.2015.vcxproj b/libs/win32/mpg123/libmpg123.2015.vcxproj
index 2f92ca7650802980e34273235a9de70ac3447857..44ce7db15b7a8addc5d58a52fc3e94761c12ec2b 100644 (file)
--- a/libs/win32/mpg123/libmpg123.2015.vcxproj
+++ b/libs/win32/mpg123/libmpg123.2015.vcxproj
@@ -247,7 +247,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -265,7 +265,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -289,7 +289,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -313,7 +313,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -332,7 +332,7 @@
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(ProjectDir)Debug\$(ProjectName).dll</OutputFile>\r
@@ -359,7 +359,7 @@
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(ProjectDir)Debug\$(ProjectName).dll</OutputFile>\r
@@ -392,7 +392,7 @@
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(ProjectDir)Release\$(ProjectName).dll</OutputFile>\r
@@ -423,7 +423,7 @@
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(ProjectDir)Release\$(ProjectName).dll</OutputFile>\r
@@ -447,7 +447,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo &gt; "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm"\r
@@ -534,7 +534,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo &gt; "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm"\r
@@ -627,7 +627,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo &gt; "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm"\r
@@ -720,7 +720,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo &gt; "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm"\r
@@ -809,7 +809,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo &gt; "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm"\r
@@ -903,7 +903,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo &gt; "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm"\r
@@ -1006,7 +1006,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>cl /I "..\.." /EP /TC "$(ProjectDir)..\..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo &gt; "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm"\r
@@ -1112,7 +1112,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
-      <DisableSpecificWarnings>4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4477;4028;4334;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>cl /I "..\.." /EP /TC "$(ProjectDir)..\..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo &gt; "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm"\r

diff --git a/libs/win32/portaudio/portaudio.2015.vcxproj b/libs/win32/portaudio/portaudio.2015.vcxproj
index 823119132f7758cbe8010de18fa237ffb6f42005..22f74ecbfa9b4ea3a9520edeb89a52d428175f9c 100644 (file)
--- a/libs/win32/portaudio/portaudio.2015.vcxproj
+++ b/libs/win32/portaudio/portaudio.2015.vcxproj
@@ -140,7 +140,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4496;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -167,7 +167,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4496;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -193,7 +193,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4496;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -219,7 +219,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4496;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -245,7 +245,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4496;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -271,7 +271,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4496;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -298,7 +298,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4496;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -325,7 +325,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4496;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r

diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj
index 52cab1670b6f36a740ef8007b3f3882f265441ef..61ef7d83f5ffa193f9f220b557529eed918ffe0c 100644 (file)
--- a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj
+++ b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj
@@ -279,7 +279,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
     <ClCompile Include="..\..\sofia-sip\libsofia-sip-ua\su\memmem.c" />\r
     <ClCompile Include="..\..\sofia-sip\libsofia-sip-ua\su\memspn.c" />\r
     <ClCompile Include="..\..\sofia-sip\libsofia-sip-ua\su\strcasestr.c" />\r
-    <ClCompile Include="..\..\sofia-sip\libsofia-sip-ua\su\strtoull.c" />\r
     <ClCompile Include="..\..\sofia-sip\libsofia-sip-ua\sip\sip_basic.c" />\r
     <ClCompile Include="..\..\sofia-sip\libsofia-sip-ua\sip\sip_caller_prefs.c" />\r
     <ClCompile Include="..\..\sofia-sip\libsofia-sip-ua\sip\sip_event.c" />\r

diff --git a/libs/win32/speex/libspeexdsp.2015.vcxproj b/libs/win32/speex/libspeexdsp.2015.vcxproj
index b230af8b498ba0a68f4db25df3ac2f21a57f4175..b30ea4e3d2f084a9d95119b206a0abdf21b649d8 100644 (file)
--- a/libs/win32/speex/libspeexdsp.2015.vcxproj
+++ b/libs/win32/speex/libspeexdsp.2015.vcxproj
@@ -38,6 +38,7 @@
     <ProjectGuid>{03207781-0D1C-4DB3-A71D-45C608F28DBD}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <ProjectName>libspeexdsp</ProjectName>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Static_SSE|Win32'" Label="Configuration">\r
@@ -129,13 +130,25 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Dynamic_SSE|Win32'">$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_Dynamic_SSE|Win32'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_Dynamic_SSE|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Dynamic_SSE|x64'">$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_Dynamic_SSE|x64'">$(Platform)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_Dynamic_SSE|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Static_SSE|Win32'">$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_Static_SSE|Win32'">$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_Static_SSE|Win32'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Static_SSE|x64'">$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_Static_SSE|x64'">$(Platform)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_Static_SSE|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r

diff --git a/libs/xmlrpc-c/lib/abyss/src/socket_win.c b/libs/xmlrpc-c/lib/abyss/src/socket_win.c
index 187c307583d0a6aea82508c6bf25c9af11585a29..58aca939de525b060fe4a1e9a294167845609ba3 100644 (file)
--- a/libs/xmlrpc-c/lib/abyss/src/socket_win.c
+++ b/libs/xmlrpc-c/lib/abyss/src/socket_win.c
@@ -277,7 +277,7 @@ channelRead(TChannel *   const channelP,
                        *bytesReceivedP = rc;
 
                        if (ChannelTraceIsActive)
-                               fprintf(stderr, "Abyss channel: read %u bytes: '%.*s'\n", bytesReceivedP, (int)(*bytesReceivedP), buffer);
+                               fprintf(stderr, "Abyss channel: read %u bytes: '%.*s'\n", *bytesReceivedP, (int)(*bytesReceivedP), buffer);
                }
        }
 }

diff --git a/libs/xmlrpc-c/lib/libutil/sleep.c b/libs/xmlrpc-c/lib/libutil/sleep.c
index 15b515075a5b85841c2b07fb183840d54640d94c..213dae5c669f2a1b1c4c036ebfd22d17a31cf998 100644 (file)
--- a/libs/xmlrpc-c/lib/libutil/sleep.c
+++ b/libs/xmlrpc-c/lib/libutil/sleep.c
@@ -1,6 +1,3 @@
-#include "bool.h"
-
-#include "xmlrpc-c/sleep_int.h"
 
 #ifdef WIN32
 #include <windows.h>
@@ -8,6 +5,9 @@
 #else
 #include <unistd.h>
 #endif
+#include "bool.h"
+
+#include "xmlrpc-c/sleep_int.h"
 
 
 void

diff --git a/src/mod/applications/mod_commands/mod_commands.2015.vcxproj b/src/mod/applications/mod_commands/mod_commands.2015.vcxproj
index 73a8b20e00adeb720a06ab60ed524060c48d0524..639fe0ac4898be45cba1058103dc71d90f84169e 100644 (file)
--- a/src/mod/applications/mod_commands/mod_commands.2015.vcxproj
+++ b/src/mod/applications/mod_commands/mod_commands.2015.vcxproj
@@ -89,6 +89,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <EnablePREfast>false</EnablePREfast>\r
+      <DisableSpecificWarnings>4457;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -104,6 +105,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <EnablePREfast>false</EnablePREfast>\r
+      <DisableSpecificWarnings>4457;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -117,6 +119,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <EnablePREfast>false</EnablePREfast>\r
+      <DisableSpecificWarnings>4457;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -132,6 +135,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <EnablePREfast>false</EnablePREfast>\r
+      <DisableSpecificWarnings>4457;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r

diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c
index 844bb245487b428b501c2cd1f02eb12cddce63c4..574d139256ddd32c4d09ff862e080a2c78a9059f 100644 (file)
--- a/src/mod/applications/mod_conference/conference_api.c
+++ b/src/mod/applications/mod_conference/conference_api.c
@@ -1002,7 +1002,8 @@ switch_status_t conference_api_sub_volume_out(conference_member_t *member, switc
 
 switch_status_t conference_api_sub_vid_bandwidth(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-       int32_t i, video_write_bandwidth;
+       uint32_t i;
+       int32_t video_write_bandwidth;
        int x = 0;
 
        if (!conference_utils_test_flag(conference, CFLAG_MINIMIZE_VIDEO_ENCODING)) {
@@ -1088,7 +1089,7 @@ switch_status_t conference_api_sub_vid_fps(conference_obj_t *conference, switch_
                return SWITCH_STATUS_SUCCESS;
        }
 
-       fps = atof(argv[2]);
+       fps = (float)atof(argv[2]);
 
        if (conference_video_set_fps(conference, fps)) {
                stream->write_function(stream, "FPS set to [%s]\n", argv[2]);
@@ -1134,7 +1135,7 @@ switch_status_t conference_api_sub_write_png(conference_obj_t *conference, switc
 switch_status_t conference_api_sub_vid_layout(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
        video_layout_t *vlayout = NULL;
-       int idx = 0;
+       uint32_t idx = 0;
 
        if (!argv[2]) {
                stream->write_function(stream, "Invalid input\n");
@@ -1932,7 +1933,7 @@ switch_status_t conference_api_sub_relate(conference_obj_t *conference, switch_s
                switch_mutex_lock(conference->mutex);
 
                if (conference->relationship_total) {
-                       int member_id = 0;
+                       uint32_t member_id = 0;
 
                        if (argc == 3) member_id = atoi(argv[2]);
 

diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c
index 0a05b7c9f0a1873f552e4accd760c7cd03cab0f8..bae690f061ebfe862a977718bfe1d8b55d84a12f 100644 (file)
--- a/src/mod/applications/mod_conference/conference_member.c
+++ b/src/mod/applications/mod_conference/conference_member.c
@@ -733,7 +733,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
                conference_video_check_avatar(member, SWITCH_FALSE);
 
                if ((var = switch_channel_get_variable_dup(member->channel, "video_initial_canvas", SWITCH_FALSE, -1))) {
-                       int id = atoi(var) - 1;
+                       uint32_t id = atoi(var) - 1;
                        if (id < conference->canvas_count) {
                                member->canvas_id = id;
                                member->layer_timeout = DEFAULT_LAYER_TIMEOUT;
@@ -741,7 +741,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
                }
 
                if ((var = switch_channel_get_variable_dup(member->channel, "video_initial_watching_canvas", SWITCH_FALSE, -1))) {
-                       int id = atoi(var) - 1;
+                       uint32_t id = atoi(var) - 1;
 
                        if (id == 0) {
                                id = conference->canvas_count;
@@ -1560,16 +1560,16 @@ int conference_member_get_canvas_id(conference_member_t *member, const char *val
        }
 
        if (watching) {
-               if (index > member->conference->canvas_count || !member->conference->canvases[index]) {
-                       index = 0;
-               } else if (index < 0) {
+               if (index < 0) {
                        index = member->conference->canvas_count;
+               } else if ((uint32_t)index > member->conference->canvas_count || !member->conference->canvases[index]) {
+                       index = 0;
                }
        } else {
-               if (index >= member->conference->canvas_count || !member->conference->canvases[index]) {
-                       index = 0;
-               } else if (index < 0) {
+               if (index < 0) {
                        index = member->conference->canvas_count;
+               } else if ((uint32_t)index >= member->conference->canvas_count || !member->conference->canvases[index]) {
+                       index = 0;
                }
        }
 
@@ -1578,11 +1578,11 @@ int conference_member_get_canvas_id(conference_member_t *member, const char *val
        }
 
        if (member->conference->canvas_count > 1) {
-               if (index > member->conference->canvas_count) {
+               if ((uint32_t)index > member->conference->canvas_count) {
                        return -1;
                }
        } else {
-               if (index >= member->conference->canvas_count) {
+               if ((uint32_t)index >= member->conference->canvas_count) {
                        return -1;
                }
        }

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 6e1c1d0d2faa0f191daefee2eed46b84a558c012..7ea4378349eca7b2adc3a61ec04767709e8acdd0 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -59,7 +59,7 @@ static struct conference_fps FPS_VALS[] = {
 
 int conference_video_set_fps(conference_obj_t *conference, float fps)
 {
-       int i = 0, j = 0;
+       uint32_t i = 0, j = 0;
 
        for (i = 0; FPS_VALS[i].ms; i++) {
                if (FPS_VALS[i].fps == fps) {
@@ -223,10 +223,10 @@ void conference_video_parse_layouts(conference_obj_t *conference, int WIDTH, int
 
                                        if (auto_3d || audio_position) {
                                                if (auto_3d || !strcasecmp(audio_position, "auto")) {
-                                                       int x_pos = WIDTH * x / VIDEO_LAYOUT_SCALE;
-                                                       int y_pos = HEIGHT * y / VIDEO_LAYOUT_SCALE;
-                                                       int width = WIDTH * scale / VIDEO_LAYOUT_SCALE;
-                                                       int height = HEIGHT * hscale / VIDEO_LAYOUT_SCALE;
+                                                       int x_pos = (int)(WIDTH * x / VIDEO_LAYOUT_SCALE);
+                                                       int y_pos = (int)(HEIGHT * y / VIDEO_LAYOUT_SCALE);
+                                                       int width = (int)(WIDTH * scale / VIDEO_LAYOUT_SCALE);
+                                                       int height = (int)(HEIGHT * hscale / VIDEO_LAYOUT_SCALE);
                                                        int center_x = x_pos + width / 2;
                                                        int center_y = y_pos + height / 2;
                                                        int half_x = WIDTH / 2;
@@ -240,9 +240,9 @@ void conference_video_parse_layouts(conference_obj_t *conference, int WIDTH, int
                                                        }
 
                                                        if (center_y > half_y) {
-                                                               yv = -1 - ((center_y - half_y) / half_y) * -1;
+                                                               yv = -1.0f - ((center_y - half_y) / half_y) * -1.0f;
                                                        } else {
-                                                               yv = center_y / half_y;
+                                                               yv = (float)center_y / half_y;
                                                        }
 
                                                        vlayout->images[vlayout->layers].audio_position = switch_core_sprintf(conference->pool, "%02f:0.0:%02f", xv, yv);
@@ -383,14 +383,14 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
        }
 
        if (layer->geometry.scale) {
-               int img_w = 0, img_h = 0;
+               uint32_t img_w = 0, img_h = 0;
                double screen_aspect = 0, img_aspect = 0;
                int x_pos = layer->x_pos;
                int y_pos = layer->y_pos;
                switch_size_t img_addr = 0;
 
-               img_w = layer->screen_w = IMG->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE;
-               img_h = layer->screen_h = IMG->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE;
+               img_w = layer->screen_w = (uint32_t)(IMG->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE);
+               img_h = layer->screen_h = (uint32_t)(IMG->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE);
 
 
                screen_aspect = (double) layer->screen_w / layer->screen_h;
@@ -400,28 +400,28 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
 
                if (layer->last_img_addr != img_addr && layer->geometry.zoom) {
                        if (screen_aspect < img_aspect) {
-                               int cropsize = 0;
+                               unsigned int cropsize = 0;
                                double scale = 1;
                                if (img->d_h != layer->screen_h) {
                                        scale = (double)layer->screen_h / img->d_h;
                                }
 
-                               cropsize = ((img->d_w )-((double)layer->screen_w/scale)) / 2;
+                               cropsize = (unsigned int)(((img->d_w )-((double)layer->screen_w/scale)) / 2);
 
                                if (cropsize) {
-                                       switch_img_set_rect(img, cropsize, 0, layer->screen_w/scale, layer->screen_h/scale);
+                                       switch_img_set_rect(img, cropsize, 0, (unsigned int)(layer->screen_w/scale), (unsigned int)(layer->screen_h/scale));
                                        img_aspect = (double) img->d_w / img->d_h;
                                }
 
                        } else if (screen_aspect > img_aspect) {
-                               int cropsize = 0;
+                               unsigned int cropsize = 0;
                                double scale = 1;
                                if (img->d_w != layer->screen_w) {
                                        scale = (double)layer->screen_w / img->d_w;
                                }
-                               cropsize = ceil(((img->d_h )-((double)layer->screen_h/scale)) / 2);
+                               cropsize = (int)ceil(((img->d_h )-((double)layer->screen_h/scale)) / 2);
                                if (cropsize) {
-                                       switch_img_set_rect(img, 0, cropsize, layer->screen_w/scale, layer->screen_h/scale);
+                                       switch_img_set_rect(img, 0, cropsize, (unsigned int)(layer->screen_w/scale), (unsigned int)(layer->screen_h/scale));
                                        img_aspect = (double) img->d_w / img->d_h;
                                }
                        }
@@ -432,10 +432,10 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
                }
 
                if (screen_aspect > img_aspect) {
-                       img_w = ceil((double)img_aspect * layer->screen_h);
+                       img_w = (uint32_t)ceil((double)img_aspect * layer->screen_h);
                        x_pos += (layer->screen_w - img_w) / 2;
                } else if (screen_aspect < img_aspect) {
-                       img_h = ceil((double)layer->screen_w / img_aspect);
+                       img_h = (uint32_t)ceil((double)layer->screen_w / img_aspect);
                        y_pos += (layer->screen_h - img_h) / 2;
                }
 
@@ -748,7 +748,7 @@ void conference_video_layer_set_banner(conference_member_t *member, mcu_layer_t
 {
        switch_rgb_color_t fgcolor, bgcolor;
        int font_scale = 4;
-       int font_size = 0;
+       uint16_t font_size = 0;
        const char *fg = "#cccccc";
        const char *bg = "#142e55";
        char *parsed = NULL;
@@ -823,9 +823,9 @@ void conference_video_layer_set_banner(conference_member_t *member, mcu_layer_t
        }
 
        if (layer->screen_h < layer->screen_w) {
-               font_size = (double)(font_scale / 100.0f) * layer->screen_h;
+               font_size = (uint16_t)((double)(font_scale / 100.0f) * layer->screen_h);
        } else {
-               font_size = (double)(font_scale / 100.0f) * layer->screen_w;
+               font_size = (uint16_t)((double)(font_scale / 100.0f) * layer->screen_w);
        }
 
        switch_color_set_rgb(&fgcolor, fg);
@@ -1020,14 +1020,14 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva
                layer->refresh = 1;
 
                                                                                                                                                
-               layer->screen_w = canvas->img->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE;
-               layer->screen_h = canvas->img->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE;
+               layer->screen_w = (uint32_t)(canvas->img->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE);
+               layer->screen_h = (uint32_t)(canvas->img->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE);
 
                // if (layer->screen_w % 2) layer->screen_w++; // round to even
                // if (layer->screen_h % 2) layer->screen_h++; // round to even
 
-               layer->x_pos = canvas->img->d_w * layer->geometry.x / VIDEO_LAYOUT_SCALE;
-               layer->y_pos = canvas->img->d_h * layer->geometry.y / VIDEO_LAYOUT_SCALE;
+               layer->x_pos = (int)(canvas->img->d_w * layer->geometry.x / VIDEO_LAYOUT_SCALE);
+               layer->y_pos = (int)(canvas->img->d_h * layer->geometry.y / VIDEO_LAYOUT_SCALE);
 
 
                if (layer->geometry.floor) {
@@ -1835,7 +1835,7 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s auto-setting bitrate to %dkps because user's image is not visible\n",
                                                          switch_channel_get_name(member->channel), kps);
                } else {
-                       kps = switch_calc_bitrate(w, h, 2, member->conference->video_fps.fps);
+                       kps = switch_calc_bitrate(w, h, 2, (int)(member->conference->video_fps.fps));
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s auto-setting bitrate to %dkps to accomodate %dx%d resolution\n",
                                                          switch_channel_get_name(member->channel), kps, layer->screen_w, layer->screen_h);
                }
@@ -2711,7 +2711,8 @@ void *SWITCH_THREAD_FUNC conference_video_super_muxing_thread_run(switch_thread_
                switch_time_t now;
                int min_members = 0;
                int count_changed = 0;
-               int  layer_idx = 0, j = 0;
+               int  layer_idx = 0;
+               uint32_t j = 0;
                switch_image_t *img = NULL;
                int used_canvases = 0;
 

diff --git a/src/mod/applications/mod_conference/mod_conference.2015.vcxproj b/src/mod/applications/mod_conference/mod_conference.2015.vcxproj
index c62be0c0fde582a6c9b6b13908b3bc312ba00658..7fe146593676091fb9660aaf06e5462cbec36f7e 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.2015.vcxproj
+++ b/src/mod/applications/mod_conference/mod_conference.2015.vcxproj
@@ -93,6 +93,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <EnablePREfast>false</EnablePREfast>\r
+      <DisableSpecificWarnings>4456;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -108,6 +109,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <EnablePREfast>false</EnablePREfast>\r
+      <DisableSpecificWarnings>4456;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -121,6 +123,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <EnablePREfast>false</EnablePREfast>\r
+      <DisableSpecificWarnings>4456;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -137,6 +140,7 @@
       </PrecompiledHeader>\r
       <EnablePREfast>false</EnablePREfast>\r
       <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <DisableSpecificWarnings>4456;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 1dd7e4d9a16b58f87db70295157f719ec9d31065..b0be87268d7cd165cbd9a9680efef65a03aded9c 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -2565,7 +2565,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
                        } else if (!strcasecmp(var, "video-canvas-size") && !zstr(val)) {
                                video_canvas_size = val;
                        } else if (!strcasecmp(var, "video-fps") && !zstr(val)) {
-                               fps = atof(val);
+                               fps = (float)atof(val);
                        } else if (!strcasecmp(var, "video-codec-bandwidth") && !zstr(val)) {
                                video_codec_bandwidth = val;
                        } else if (!strcasecmp(var, "video-no-video-avatar") && !zstr(val)) {
@@ -2846,7 +2846,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
 
                if (video_codec_bandwidth) {
                        if (!strcasecmp(video_codec_bandwidth, "auto")) {
-                               conference->video_codec_settings.video.bandwidth = switch_calc_bitrate(canvas_w, canvas_h, 2, conference->video_fps.fps);
+                               conference->video_codec_settings.video.bandwidth = switch_calc_bitrate(canvas_w, canvas_h, 2, (int)conference->video_fps.fps);
                        } else {
                                conference->video_codec_settings.video.bandwidth = switch_parse_bandwidth_string(video_codec_bandwidth);
                        }

diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h
index 9cb8b3856990e065af75e8a1eef3cfe50ca94e82..b1c78a210ebac08a99154cf494504a711ca9c6e8 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.h
+++ b/src/mod/applications/mod_conference/mod_conference.h
@@ -430,8 +430,8 @@ typedef struct mcu_layer_s {
        int idx;
        int tagged;
        int bugged;
-       int screen_w;
-       int screen_h;
+       uint32_t screen_w;
+       uint32_t screen_h;
        int x_pos;
        int y_pos;
        int banner_patched;
@@ -645,7 +645,7 @@ typedef struct conference_obj {
        conference_record_t *rec_node_head;
        int last_speech_channels;
        mcu_canvas_t *canvases[MAX_CANVASES+1];
-       int canvas_count;
+       uint32_t canvas_count;
        int super_canvas_label_layers;
        int super_canvas_show_all_layers;
        int canvas_running_count;

diff --git a/src/mod/codecs/mod_opus/mod_opus.c b/src/mod/codecs/mod_opus/mod_opus.c
index bac1f9d54e0ed42da9a3699a1a65aaa14a40355b..1dc732aeced4644620c59dd6dade08cdcef3ebbb 100644 (file)
--- a/src/mod/codecs/mod_opus/mod_opus.c
+++ b/src/mod/codecs/mod_opus/mod_opus.c
@@ -209,7 +209,7 @@ static switch_status_t switch_opus_fmtp_parse(const char *fmtp, switch_codec_fmt
 
 static char *gen_fmtp(opus_codec_settings_t *settings, switch_memory_pool_t *pool)
 {
-       char buf[256] = "";
+       char buf[256] = { 0 };
     
        if (settings->useinbandfec) {
                snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "useinbandfec=1; ");
@@ -317,7 +317,7 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
        struct opus_context *context = NULL;
        int encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
        int decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-       switch_codec_fmtp_t codec_fmtp,codec_fmtp_only_remote;
+       switch_codec_fmtp_t codec_fmtp, codec_fmtp_only_remote;
        opus_codec_settings_t opus_codec_settings = { 0 };
        opus_codec_settings_t opus_codec_settings_remote = { 0 };
     
@@ -375,11 +375,11 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
                 * maxplaybackrate=R3,sprop-maxcapturerate=R4
                 * then it should start the encoder at sample rate: min(R1, R4) and the decoder at sample rate: min(R3, R2)*/
                if (codec_fmtp.private_info) {
-                               opus_codec_settings_t *codec_settings = codec_fmtp_only_remote.private_info;
-                               if (opus_codec_settings.sprop_maxcapturerate || codec_settings->maxplaybackrate) {
+                               opus_codec_settings_t *settings = codec_fmtp_only_remote.private_info;
+                               if (opus_codec_settings.sprop_maxcapturerate || settings->maxplaybackrate) {
                                        enc_samplerate = opus_codec_settings.sprop_maxcapturerate; /*R4*/
-                                       if (codec_settings->maxplaybackrate < enc_samplerate && codec_settings->maxplaybackrate) {
-                                               enc_samplerate = codec_settings->maxplaybackrate; /*R1*/
+                                       if (settings->maxplaybackrate < enc_samplerate && settings->maxplaybackrate) {
+                                               enc_samplerate = settings->maxplaybackrate; /*R1*/
                                                context->enc_frame_size = enc_samplerate * (codec->implementation->microseconds_per_packet / 1000) / 1000;
                                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder will be created at sample rate %d hz\n",enc_samplerate);
                                        } else {
@@ -461,11 +461,11 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
                
                if (opus_prefs.asymmetric_samplerates) {
                        if (codec_fmtp.private_info) {
-                               opus_codec_settings_t *codec_settings = codec_fmtp_only_remote.private_info;
-                               if (opus_codec_settings.maxplaybackrate || codec_settings->sprop_maxcapturerate ) {       
+                               opus_codec_settings_t *settings = codec_fmtp_only_remote.private_info;
+                               if (opus_codec_settings.maxplaybackrate || settings->sprop_maxcapturerate ) {       
                                        dec_samplerate = opus_codec_settings.maxplaybackrate; /* R3 */
-                                       if (dec_samplerate > codec_settings->sprop_maxcapturerate && codec_settings->sprop_maxcapturerate){
-                                               dec_samplerate = codec_settings->sprop_maxcapturerate; /* R2 */
+                                       if (dec_samplerate > settings->sprop_maxcapturerate && settings->sprop_maxcapturerate){
+                                               dec_samplerate = settings->sprop_maxcapturerate; /* R2 */
                                                context->dec_frame_size = dec_samplerate*(codec->implementation->microseconds_per_packet / 1000) / 1000;
                                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus decoder will be created at sample rate %d hz\n",dec_samplerate);
                                        } else {
@@ -731,7 +731,7 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec)
        uint32_t LBRR_threshold_bitrate,LBRR_rate_thres_bps,real_target_bitrate ;  
        opus_int32 a32,b32; 
        uint32_t fs = context->enc_frame_size * 1000 / (codec->implementation->microseconds_per_packet / 1000);
-       float frame_rate = 1000 / (codec->implementation->microseconds_per_packet / 1000);
+       float frame_rate =(float)(1000 / (codec->implementation->microseconds_per_packet / 1000));
        uint32_t step = (codec->implementation->microseconds_per_packet / 1000) != 60 ? 8000 / (codec->implementation->microseconds_per_packet / 1000 ) : 134 ;
 
        opus_encoder_ctl(context->encoder_object, OPUS_GET_BITRATE(&current_bitrate));
@@ -748,7 +748,7 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec)
                LBRR_rate_thres_bps = 16000; /*LBRR_WB_MIN_RATE_BPS*/
        }
        /*see opus-1.1/src/opus_encoder.c , opus_encode_native() */
-       real_target_bitrate =  8 * (current_bitrate * context->enc_frame_size / ( fs * 8 ) - 1) * frame_rate ;
+       real_target_bitrate =  (uint32_t)(8 * (current_bitrate * context->enc_frame_size / ( fs * 8 ) - 1) * frame_rate );
        /*check if the internally used bitrate is above the threshold defined in opus-1.1/silk/control_codec.c  */
        a32 =  LBRR_rate_thres_bps * (125 -(((current_loss) < (25)) ? (current_loss) :  (25)));
        b32 =  ((opus_int32)((0.01) * ((opus_int64)1 << (16)) + 0.5));
@@ -767,7 +767,7 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec)
        } else {
                while (real_target_bitrate <= LBRR_threshold_bitrate) {
                        current_bitrate += step;
-                       real_target_bitrate =  8 * (current_bitrate * context->enc_frame_size / ( fs * 8 ) - 1) * frame_rate ;
+                       real_target_bitrate =  (uint32_t)(8 * (current_bitrate * context->enc_frame_size / ( fs * 8 ) - 1) * frame_rate);
                }
                opus_encoder_ctl(context->encoder_object,OPUS_SET_BITRATE(current_bitrate));
                if (globals.debug)

diff --git a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj
index dcac8e44eeaba9470599daaef03eaab29b54605e..d696a1973dd396703aeb2bc376a619b49bb483fc 100644 (file)
--- a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj
+++ b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj
@@ -96,7 +96,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -114,7 +114,7 @@
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -132,7 +132,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -149,7 +149,7 @@
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.2015.vcxproj b/src/mod/endpoints/mod_skinny/mod_skinny.2015.vcxproj
index e64da4474f779cb5e70d2597381effb303d3f91a..ed6e63a786092ed5304b92c28b85bf2c54f6a9ff 100644 (file)
--- a/src/mod/endpoints/mod_skinny/mod_skinny.2015.vcxproj
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.2015.vcxproj
@@ -92,7 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4456;4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -109,7 +109,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4456;4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -126,7 +126,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4456;4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -142,7 +142,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4456;4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r