From 5de2f7d7bd651fc79495291abe1a484a6a07d1f1 Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Thu, 27 Aug 2015 18:49:13 -0600 Subject: [PATCH] FS-7966: multiple fixes for msvc 2015 build, silence multiple warnings --- .gitignore | 1 + libs/broadvoice/src/libbroadvoice.2015.vcxproj | 1 - libs/broadvoice/src/msvc/inttypes.h | 2 ++ libs/esl/src/esl.2015.vcxproj | 8 ++++---- libs/ilbc/src/msvc/inttypes.h | 4 ++++ libs/libdingaling/libdingaling.2015.vcxproj | 16 ++++++++-------- libs/libg722_1/src/msvc/inttypes.h | 2 ++ libs/win32/apr/libapr.2015.vcxproj | 8 ++++---- libs/win32/ldns/ldns-lib/ldns-lib.2015.vcxproj | 9 ++++----- libs/win32/openssl/libeay32.2015.vcxproj | 8 ++++---- libs/win32/openssl/ssleay32.2015.vcxproj | 8 ++++---- .../sofia/libsofia_sip_ua_static.2015.vcxproj | 8 ++++---- libs/win32/v8/libv8.2015.vcxproj | 15 ++++++++++----- libs/win32/xmlrpc-c/xmlrpc.2015.vcxproj | 8 ++++---- src/mod/.gitignore | 5 +++++ .../applications/mod_fifo/mod_fifo.2015.vcxproj | 4 ++++ .../mod_httapi/mod_httapi.2015.vcxproj | 8 ++++---- src/mod/codecs/mod_opus/mod_opus.2015.vcxproj | 8 ++++---- .../win32/gsmlib.2015.vcxproj | 6 ++++-- .../mod_loopback/mod_loopback.2015.vcxproj | 4 ++++ .../endpoints/mod_sofia/mod_sofia.2015.vcxproj | 8 ++++---- .../endpoints/mod_verto/mod_verto.2015.vcxproj | 4 ++++ src/switch_core_session.c | 8 ++++---- w32/Library/FreeSwitchCore.2015.vcxproj | 8 ++++---- 24 files changed, 96 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index 51538e16cd..3a1c3e60e2 100644 --- a/.gitignore +++ b/.gitignore @@ -231,3 +231,4 @@ yum/RPMS yum/temp html5/verto/verto_communicator/bower_components/ html5/verto/verto_communicator/node_modules/ +.vs/ diff --git a/libs/broadvoice/src/libbroadvoice.2015.vcxproj b/libs/broadvoice/src/libbroadvoice.2015.vcxproj index 0b0b5abd8f..83d3082e2a 100644 --- a/libs/broadvoice/src/libbroadvoice.2015.vcxproj +++ b/libs/broadvoice/src/libbroadvoice.2015.vcxproj @@ -202,7 +202,6 @@ - diff --git a/libs/broadvoice/src/msvc/inttypes.h b/libs/broadvoice/src/msvc/inttypes.h index 7c83fbb433..f8793e70ff 100644 --- a/libs/broadvoice/src/msvc/inttypes.h +++ b/libs/broadvoice/src/msvc/inttypes.h @@ -59,6 +59,8 @@ typedef __int64 int64_t; #define strcasecmp _stricmp #if _MSC_VER < 1900 #define snprintf _snprintf +#else +#include #endif #if !defined(INFINITY) diff --git a/libs/esl/src/esl.2015.vcxproj b/libs/esl/src/esl.2015.vcxproj index 3dca80aa28..9a7d2978d7 100644 --- a/libs/esl/src/esl.2015.vcxproj +++ b/libs/esl/src/esl.2015.vcxproj @@ -80,7 +80,7 @@ MultiThreadedDebugDLL Level4 false - 4267;4244;4706;4100;%(DisableSpecificWarnings) + 6031;4267;4244;4706;4100;%(DisableSpecificWarnings) true @@ -97,7 +97,7 @@ MultiThreadedDebugDLL Level4 false - 4267;4244;4706;4100;%(DisableSpecificWarnings) + 6031;4267;4244;4706;4100;%(DisableSpecificWarnings) true @@ -108,7 +108,7 @@ MultiThreadedDLL Level4 false - 4267;4244;4706;4100;%(DisableSpecificWarnings) + 6031;4267;4244;4706;4100;%(DisableSpecificWarnings) true @@ -122,7 +122,7 @@ MultiThreadedDLL Level4 false - 4267;4244;4706;4100;%(DisableSpecificWarnings) + 6031;4267;4244;4706;4100;%(DisableSpecificWarnings) true diff --git a/libs/ilbc/src/msvc/inttypes.h b/libs/ilbc/src/msvc/inttypes.h index b0f062464c..f8793e70ff 100644 --- a/libs/ilbc/src/msvc/inttypes.h +++ b/libs/ilbc/src/msvc/inttypes.h @@ -57,7 +57,11 @@ typedef __int64 int64_t; #define strncasecmp _strnicmp #define strcasecmp _stricmp +#if _MSC_VER < 1900 #define snprintf _snprintf +#else +#include +#endif #if !defined(INFINITY) #define INFINITY 0x7fffffff diff --git a/libs/libdingaling/libdingaling.2015.vcxproj b/libs/libdingaling/libdingaling.2015.vcxproj index e21fe2d984..1c4683b916 100644 --- a/libs/libdingaling/libdingaling.2015.vcxproj +++ b/libs/libdingaling/libdingaling.2015.vcxproj @@ -137,7 +137,7 @@ EnableFastChecks MultiThreadedDebugDLL Level4 - 4701;4702;4703;4100;4706;%(DisableSpecificWarnings) + 4456;4457;4701;4702;4703;4100;4706;%(DisableSpecificWarnings) @@ -146,7 +146,7 @@ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL Level4 - 4701;4702;4703;4100;%(DisableSpecificWarnings) + 4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings) @@ -161,7 +161,7 @@ Level4 EditAndContinue - 4701;4702;4703;4100;%(DisableSpecificWarnings) + 4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings) libapr-1.lib;libaprutil-1.lib;iksemel.lib;Ws2_32.lib;%(AdditionalDependencies) @@ -184,7 +184,7 @@ Level4 ProgramDatabase - 4701;4702;4703;4100;%(DisableSpecificWarnings) + 4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings) libapr-1.lib;libaprutil-1.lib;iksemel.lib;Ws2_32.lib;%(AdditionalDependencies) @@ -207,7 +207,7 @@ EnableFastChecks MultiThreadedDebugDLL Level4 - 4701;4702;4703;4100;4706;%(DisableSpecificWarnings) + 4456;4457;4701;4702;4703;4100;4706;%(DisableSpecificWarnings) @@ -219,7 +219,7 @@ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL Level4 - 4701;4702;4703;4100;%(DisableSpecificWarnings) + 4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings) @@ -237,7 +237,7 @@ Level4 ProgramDatabase - 4701;4702;4703;4100;%(DisableSpecificWarnings) + 4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings) libapr-1.lib;libaprutil-1.lib;iksemel.lib;Ws2_32.lib;%(AdditionalDependencies) @@ -264,7 +264,7 @@ Level4 ProgramDatabase - 4701;4702;4703;4100;%(DisableSpecificWarnings) + 4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings) libapr-1.lib;libaprutil-1.lib;iksemel.lib;Ws2_32.lib;%(AdditionalDependencies) diff --git a/libs/libg722_1/src/msvc/inttypes.h b/libs/libg722_1/src/msvc/inttypes.h index 7c83fbb433..f8793e70ff 100644 --- a/libs/libg722_1/src/msvc/inttypes.h +++ b/libs/libg722_1/src/msvc/inttypes.h @@ -59,6 +59,8 @@ typedef __int64 int64_t; #define strcasecmp _stricmp #if _MSC_VER < 1900 #define snprintf _snprintf +#else +#include #endif #if !defined(INFINITY) diff --git a/libs/win32/apr/libapr.2015.vcxproj b/libs/win32/apr/libapr.2015.vcxproj index 85bf674c4c..6656552275 100644 --- a/libs/win32/apr/libapr.2015.vcxproj +++ b/libs/win32/apr/libapr.2015.vcxproj @@ -85,7 +85,7 @@ xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D / MultiThreadedDebugDLL Level3 true - 4244;4018;4267;4090;4133;%(DisableSpecificWarnings) + 4311;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings) _DEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) @@ -121,7 +121,7 @@ xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D / MultiThreadedDebugDLL Level3 true - 4244;4018;4267;4090;4133;%(DisableSpecificWarnings) + 4311;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings) _DEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) @@ -157,7 +157,7 @@ xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D / true Level3 true - 4244;4018;4267;4090;4133;%(DisableSpecificWarnings) + 4311;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings) NDEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) @@ -194,7 +194,7 @@ xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D / true Level3 true - 4244;4018;4267;4090;4133;%(DisableSpecificWarnings) + 4311;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings) NDEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) diff --git a/libs/win32/ldns/ldns-lib/ldns-lib.2015.vcxproj b/libs/win32/ldns/ldns-lib/ldns-lib.2015.vcxproj index 93bde75b3f..316b6fbb15 100644 --- a/libs/win32/ldns/ldns-lib/ldns-lib.2015.vcxproj +++ b/libs/win32/ldns/ldns-lib/ldns-lib.2015.vcxproj @@ -85,7 +85,7 @@ Disabled ..\..\..\ldns\;.;%(AdditionalIncludeDirectories) - HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + HAVE_ISBLANK;HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -106,7 +106,7 @@ if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" Disabled ..\..\..\ldns\;.;%(AdditionalIncludeDirectories) - HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + HAVE_ISBLANK;HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 @@ -130,7 +130,7 @@ if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" true Level3 ProgramDatabase - HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions) + HAVE_ISBLANK;HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions) ..\..\..\ldns\;.;%(AdditionalIncludeDirectories) 4013;4101;4996;4267;4244;%(DisableSpecificWarnings) @@ -157,7 +157,7 @@ if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" true Level3 ProgramDatabase - HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions) + HAVE_ISBLANK;HAVE_STRUCT_ADDRINFO;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions) ..\..\..\ldns\;.;%(AdditionalIncludeDirectories) 4013;4101;4996;4267;4244;%(DisableSpecificWarnings) @@ -198,7 +198,6 @@ if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" - diff --git a/libs/win32/openssl/libeay32.2015.vcxproj b/libs/win32/openssl/libeay32.2015.vcxproj index 33de8589c5..bbe086cd21 100644 --- a/libs/win32/openssl/libeay32.2015.vcxproj +++ b/libs/win32/openssl/libeay32.2015.vcxproj @@ -110,7 +110,7 @@ if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os. Level3 true ProgramDatabase - 4164;4996;4267;4244;%(DisableSpecificWarnings) + 4311;4164;4996;4267;4244;%(DisableSpecificWarnings) false @@ -146,7 +146,7 @@ if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os. Level3 ProgramDatabase - 4164;4996;4267;4244;%(DisableSpecificWarnings) + 4311;4164;4996;4267;4244;%(DisableSpecificWarnings) false @@ -180,7 +180,7 @@ if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os. Level3 true ProgramDatabase - 4164;4996;4267;4244;%(DisableSpecificWarnings) + 4311;4164;4996;4267;4244;%(DisableSpecificWarnings) false @@ -216,7 +216,7 @@ if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os. Level3 ProgramDatabase - 4164;4996;4267;4244;%(DisableSpecificWarnings) + 4311;4164;4996;4267;4244;%(DisableSpecificWarnings) false diff --git a/libs/win32/openssl/ssleay32.2015.vcxproj b/libs/win32/openssl/ssleay32.2015.vcxproj index 837cb59187..50a965b30a 100644 --- a/libs/win32/openssl/ssleay32.2015.vcxproj +++ b/libs/win32/openssl/ssleay32.2015.vcxproj @@ -104,7 +104,7 @@ Level3 true ProgramDatabase - 4267;4244;%(DisableSpecificWarnings) + 4311;4267;4244;%(DisableSpecificWarnings) $(ProjectDir)$(Configuration);%(AdditionalLibraryDirectories) @@ -132,7 +132,7 @@ Level3 true ProgramDatabase - 4267;4244;%(DisableSpecificWarnings) + 4311;4267;4244;%(DisableSpecificWarnings) $(ProjectDir)$(Configuration);%(AdditionalLibraryDirectories) @@ -162,7 +162,7 @@ Level3 ProgramDatabase - 4267;4244;%(DisableSpecificWarnings) + 4311;4267;4244;%(DisableSpecificWarnings) %(AdditionalDependencies) @@ -193,7 +193,7 @@ Level3 ProgramDatabase - 4267;4244;%(DisableSpecificWarnings) + 4311;4267;4244;%(DisableSpecificWarnings) %(AdditionalDependencies) diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj index 4940b4eb0e..52cab1670b 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj @@ -95,7 +95,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Level4 false true - 4244;4267;4306;%(DisableSpecificWarnings) + 4456;4457;4459;4477;4244;4267;4306;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -132,7 +132,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Level4 false true - 4244;4267;4306;%(DisableSpecificWarnings) + 4456;4457;4459;4477;4244;4267;4306;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -167,7 +167,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Level4 false true - 4244;4267;4306;%(DisableSpecificWarnings) + 4456;4457;4459;4477;4244;4267;4306;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) @@ -205,7 +205,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Level4 false true - 4244;4267;4306;%(DisableSpecificWarnings) + 4456;4457;4459;4477;4244;4267;4306;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) diff --git a/libs/win32/v8/libv8.2015.vcxproj b/libs/win32/v8/libv8.2015.vcxproj index b8e8c5a1df..d4ccafc66e 100644 --- a/libs/win32/v8/libv8.2015.vcxproj +++ b/libs/win32/v8/libv8.2015.vcxproj @@ -23,27 +23,32 @@ {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2} libv8 Win32Proj + 8.1 Utility - MultiByte + NotSet v140 + false Utility - MultiByte + NotSet v140 + false Utility - MultiByte + NotSet v140 + false Utility - MultiByte + NotSet v140 + false @@ -145,4 +150,4 @@ - + \ No newline at end of file diff --git a/libs/win32/xmlrpc-c/xmlrpc.2015.vcxproj b/libs/win32/xmlrpc-c/xmlrpc.2015.vcxproj index be0be77bf1..c9234e2f6c 100644 --- a/libs/win32/xmlrpc-c/xmlrpc.2015.vcxproj +++ b/libs/win32/xmlrpc-c/xmlrpc.2015.vcxproj @@ -91,7 +91,7 @@ MultiThreadedDebugDLL Level3 true - 4267;%(DisableSpecificWarnings) + 6031;4312;4267;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -121,7 +121,7 @@ MultiThreadedDebugDLL Level3 true - 4267;%(DisableSpecificWarnings) + 6031;4312;4267;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -150,7 +150,7 @@ true Level3 true - 4267;%(DisableSpecificWarnings) + 6031;4312;4267;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) @@ -181,7 +181,7 @@ true Level3 true - 4267;%(DisableSpecificWarnings) + 6031;4312;4267;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) diff --git a/src/mod/.gitignore b/src/mod/.gitignore index d799cbe58b..9b41e69fa3 100644 --- a/src/mod/.gitignore +++ b/src/mod/.gitignore @@ -76,3 +76,8 @@ */*/Makefile.in */*/Makefile */*/mod_*.log +codecs/mod_amr/Win32/ +codecs/mod_g723_1/Win32/ +codecs/mod_g729/Win32/ +directories/mod_ldap/Win32/ +languages/mod_managed/Win32/ \ No newline at end of file diff --git a/src/mod/applications/mod_fifo/mod_fifo.2015.vcxproj b/src/mod/applications/mod_fifo/mod_fifo.2015.vcxproj index 0552e3bba3..de0e1180f5 100644 --- a/src/mod/applications/mod_fifo/mod_fifo.2015.vcxproj +++ b/src/mod/applications/mod_fifo/mod_fifo.2015.vcxproj @@ -72,6 +72,7 @@ + 4456;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -86,6 +87,7 @@ + 4456;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -98,6 +100,7 @@ + 4456;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -112,6 +115,7 @@ + 4456;6340;6246;6011;6387;%(DisableSpecificWarnings) false diff --git a/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj b/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj index 590f0a3773..2d4a04b13a 100644 --- a/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj +++ b/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj @@ -72,7 +72,7 @@ - 6053;6340;6246;6011;6387;%(DisableSpecificWarnings) + 4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) @@ -88,7 +88,7 @@ - 6053;6340;6246;6011;6387;%(DisableSpecificWarnings) + 4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) @@ -102,7 +102,7 @@ - 6053;6340;6246;6011;6387;%(DisableSpecificWarnings) + 4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) @@ -118,7 +118,7 @@ - 6053;6340;6246;6011;6387;%(DisableSpecificWarnings) + 4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) diff --git a/src/mod/codecs/mod_opus/mod_opus.2015.vcxproj b/src/mod/codecs/mod_opus/mod_opus.2015.vcxproj index b64c1b7e7e..0ded01f8d2 100644 --- a/src/mod/codecs/mod_opus/mod_opus.2015.vcxproj +++ b/src/mod/codecs/mod_opus/mod_opus.2015.vcxproj @@ -73,7 +73,7 @@ ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) - 6053;6340;6246;6011;6387;%(DisableSpecificWarnings) + 6031;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -89,7 +89,7 @@ ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) - 6053;6340;6246;6011;6387;%(DisableSpecificWarnings) + 6031;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -103,7 +103,7 @@ ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) - 6053;6340;6246;6011;6387;%(DisableSpecificWarnings) + 6031;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -119,7 +119,7 @@ ..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories) - 6053;6340;6246;6011;6387;%(DisableSpecificWarnings) + 6031;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) false diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2015.vcxproj b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2015.vcxproj index 693195065e..34061747e3 100644 --- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2015.vcxproj +++ b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2015.vcxproj @@ -101,7 +101,7 @@ Level3 true /wd4290 /wd4996 %(AdditionalOptions) - 4101;4244;4554;%(DisableSpecificWarnings) + 4838;4267;4101;4244;4554;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) @@ -128,7 +128,7 @@ true EditAndContinue /wd4290 /wd4996 %(AdditionalOptions) - 4101;4244;4554;%(DisableSpecificWarnings) + 4838;4267;4101;4244;4554;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -161,6 +161,7 @@ Level3 true /wd4290 /wd4996 %(AdditionalOptions) + 4838;4267;4101;4244;4554;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) @@ -189,6 +190,7 @@ true ProgramDatabase /wd4290 /wd4996 %(AdditionalOptions) + 4838;4267;4101;4244;4554;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) diff --git a/src/mod/endpoints/mod_loopback/mod_loopback.2015.vcxproj b/src/mod/endpoints/mod_loopback/mod_loopback.2015.vcxproj index b4ce692de2..896b668e13 100644 --- a/src/mod/endpoints/mod_loopback/mod_loopback.2015.vcxproj +++ b/src/mod/endpoints/mod_loopback/mod_loopback.2015.vcxproj @@ -73,6 +73,7 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) + 6244;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -88,6 +89,7 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) + 6244;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -100,6 +102,7 @@ + 6244;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -114,6 +117,7 @@ + 6244;6340;6246;6011;6387;%(DisableSpecificWarnings) false diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.2015.vcxproj b/src/mod/endpoints/mod_sofia/mod_sofia.2015.vcxproj index d7fb704627..89e702ff7f 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.2015.vcxproj +++ b/src/mod/endpoints/mod_sofia/mod_sofia.2015.vcxproj @@ -90,7 +90,7 @@ LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB;LIBSRES_STATIC;%(PreprocessorDefinitions) - 4201;%(DisableSpecificWarnings) + 4456;4457;4201;%(DisableSpecificWarnings) false @@ -110,7 +110,7 @@ LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB;LIBSRES_STATIC;%(PreprocessorDefinitions) - 4201;%(DisableSpecificWarnings) + 4456;4457;4201;%(DisableSpecificWarnings) false @@ -128,7 +128,7 @@ LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB;LIBSRES_STATIC;%(PreprocessorDefinitions) - 4201;%(DisableSpecificWarnings) + 4456;4457;4201;%(DisableSpecificWarnings) false @@ -148,7 +148,7 @@ LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB;LIBSRES_STATIC;%(PreprocessorDefinitions) - 4201;%(DisableSpecificWarnings) + 4456;4457;4201;%(DisableSpecificWarnings) false diff --git a/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj b/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj index 48b89f5603..2d18528bdc 100644 --- a/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj +++ b/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj @@ -78,6 +78,7 @@ $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast _TIMESPEC_DEFINED;_DEBUG;DEBUG;%(PreprocessorDefinitions) + 6031;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -94,6 +95,7 @@ $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast _TIMESPEC_DEFINED;_DEBUG;DEBUG;%(PreprocessorDefinitions) + 6031;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -108,6 +110,7 @@ $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast _TIMESPEC_DEFINED;NDEBUG;%(PreprocessorDefinitions) + 6031;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -124,6 +127,7 @@ $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast _TIMESPEC_DEFINED;NDEBUG;%(PreprocessorDefinitions) + 6031;6340;6246;6011;6387;%(DisableSpecificWarnings) false diff --git a/src/switch_core_session.c b/src/switch_core_session.c index 4573434492..b6f924df7a 100644 --- a/src/switch_core_session.c +++ b/src/switch_core_session.c @@ -1678,7 +1678,7 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread_pool_worker(switch_th session_manager.running++; switch_mutex_unlock(session_manager.mutex); #ifdef DEBUG_THREAD_POOL - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Worker Thread %ld Started\n", (long) thread); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Worker Thread %ld Started\n", (long) (intptr_t) thread); #endif while(session_manager.ready) { switch_status_t check_status; @@ -1706,7 +1706,7 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread_pool_worker(switch_th session_manager.busy++; switch_mutex_unlock(session_manager.mutex); #ifdef DEBUG_THREAD_POOL - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Worker Thread %ld Processing\n", (long) thread); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Worker Thread %ld Processing\n", (long) (intptr_t) thread); #endif td->func(thread, td->obj); @@ -1719,7 +1719,7 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread_pool_worker(switch_th free(td); } #ifdef DEBUG_THREAD_POOL - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Worker Thread %ld Done Processing\n", (long) thread); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Worker Thread %ld Done Processing\n", (long)(intptr_t) thread); #endif switch_mutex_lock(session_manager.mutex); session_manager.busy--; @@ -1733,7 +1733,7 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread_pool_worker(switch_th } } #ifdef DEBUG_THREAD_POOL - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Worker Thread %ld Ended\n", (long) thread); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Worker Thread %ld Ended\n", (long)(intptr_t) thread); #endif switch_mutex_lock(session_manager.mutex); session_manager.running--; diff --git a/w32/Library/FreeSwitchCore.2015.vcxproj b/w32/Library/FreeSwitchCore.2015.vcxproj index 9f2db523a9..048a7cf368 100644 --- a/w32/Library/FreeSwitchCore.2015.vcxproj +++ b/w32/Library/FreeSwitchCore.2015.vcxproj @@ -112,7 +112,7 @@ false Default false - 4456;4703;4305;4306;4701;4996;4018;4389;4996;4267;4244;4127;4100;4232;6340;6246;6011;6387;%(DisableSpecificWarnings) + 4456;4457;4458;4459;4456;4703;4305;4306;4701;4996;4018;4389;4996;4267;4244;4127;4100;4232;6340;6246;6011;6387;%(DisableSpecificWarnings) true @@ -174,7 +174,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs %(ForcedIncludeFiles) false false - 4456;4703;4305;4306;4701;4996;4018;4389;4996;4267;4244;4127;4100;4232;6340;6246;6011;6387;%(DisableSpecificWarnings) + 4456;4457;4458;4459;4456;4703;4305;4306;4701;4996;4018;4389;4996;4267;4244;4127;4100;4232;6340;6246;6011;6387;%(DisableSpecificWarnings) true @@ -225,7 +225,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs ProgramDatabase false false - 4456;4703;4305;4306;4701;4996;4018;4389;4996;4267;4244;4127;4100;4232;6340;6246;6011;6387;%(DisableSpecificWarnings) + 4456;4457;4458;4459;4456;4703;4305;4306;4701;4996;4018;4389;4996;4267;4244;4127;4100;4232;6340;6246;6011;6387;%(DisableSpecificWarnings) true @@ -276,7 +276,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs ProgramDatabase false false - 4456;4703;4305;4306;4701;4996;4018;4389;4996;4267;4244;4127;4100;4232;6340;6246;6011;6387;%(DisableSpecificWarnings) + 4456;4457;4458;4459;4456;4703;4305;4306;4701;4996;4018;4389;4996;4267;4244;4127;4100;4232;6340;6246;6011;6387;%(DisableSpecificWarnings) true