diff --git a/Freeswitch.2015.sln b/Freeswitch.2015.sln index ca58670a40..52a148b464 100644 --- a/Freeswitch.2015.sln +++ b/Freeswitch.2015.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}" EndProject @@ -402,6 +402,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skinny", "src\mod\endpoints\mod_skinny\mod_skinny.2015.vcxproj", "{CC1DD008-9406-448D-A0AD-33C3186CFADB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rtmp", "src\mod\endpoints\mod_rtmp\mod_rtmp.2015.vcxproj", "{48414740-C693-4968-9846-EE058020C64F}" + ProjectSection(ProjectDependencies) = postProject + {B4B62169-5AD4-4559-8707-3D933AC5DB39} = {B4B62169-5AD4-4559-8707-3D933AC5DB39} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "libs\spandsp\src\msvc\make_at_dictionary.2015.vcxproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}" EndProject diff --git a/libs/spandsp/src/msvc/inttypes.h b/libs/spandsp/src/msvc/inttypes.h index 8d680e27db..9612d3e1e5 100644 --- a/libs/spandsp/src/msvc/inttypes.h +++ b/libs/spandsp/src/msvc/inttypes.h @@ -19,7 +19,11 @@ extern "C" { #endif -typedef __int8 __int8_t; +#if defined(_MSC_VER) && _MSC_VER >= 1900 +#include +#else + +typedef __int8 __int8_t; typedef __int16 __int16_t; typedef __int32 __int32_t; typedef __int64 __int64_t; @@ -33,6 +37,7 @@ typedef __int16 int16_t; typedef __int32 int32_t; typedef __int64 int64_t; +#endif #if !defined(INFINITY) && _MSC_VER < 1800 #define INFINITY 0x7FFFFFFF #endif diff --git a/libs/win32/flite/flite.2015.vcxproj b/libs/win32/flite/flite.2015.vcxproj index 7b37dabc02..87208012e6 100644 --- a/libs/win32/flite/flite.2015.vcxproj +++ b/libs/win32/flite/flite.2015.vcxproj @@ -73,7 +73,7 @@ Disabled ..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories) - CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions) + CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -101,7 +101,7 @@ MaxSpeed true ..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories) - CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions) + CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/libs/win32/libshout/libshout.2015.vcxproj b/libs/win32/libshout/libshout.2015.vcxproj index f0074386c5..3ddf1c9660 100644 --- a/libs/win32/libshout/libshout.2015.vcxproj +++ b/libs/win32/libshout/libshout.2015.vcxproj @@ -72,7 +72,7 @@ MaxSpeed OnlyExplicitInline .\;..\..\libshout-2.2.2\src;..\..\libshout-2.2.2\include;..\..\libogg-1.1.3\include;..\..\pthreads-w32-2-9-1;..\..\libshout-2.2.2\win32\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_WIN32;VERSION="2.0.0";LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;WIN32;_LIB;_WIN32;VERSION="2.0.0";LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded true @@ -114,7 +114,7 @@ Disabled .\;..\..\libshout-2.2.2\src;..\..\libshout-2.2.2\include;..\..\libogg-1.1.3\include;..\..\pthreads-w32-2-9-1;..\..\libshout-2.2.2\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_WIN32;VERSION="2.0.0";LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;WIN32;_DEBUG;_LIB;_WIN32;VERSION="2.0.0";LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug diff --git a/libs/win32/pthread/pthread.2015.vcxproj b/libs/win32/pthread/pthread.2015.vcxproj index a426a207e3..d6c42c59a2 100644 --- a/libs/win32/pthread/pthread.2015.vcxproj +++ b/libs/win32/pthread/pthread.2015.vcxproj @@ -153,7 +153,7 @@ MaxSpeed OnlyExplicitInline ../../pthreads-w32-2-9-1/;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;HAVE_CONFIG_H;__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -224,7 +224,7 @@ Disabled ../../pthreads-w32-2-9-1/;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;HAVE_CONFIG_H;__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;%(PreprocessorDefinitions) false Default MultiThreadedDebugDLL @@ -293,7 +293,7 @@ Disabled ../../pthreads-w32-2-9-1/;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;HAVE_CONFIG_H;__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -360,7 +360,7 @@ MaxSpeed OnlyExplicitInline ../../pthreads-w32-2-9-1/;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;HAVE_CONFIG_H;__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj index 5ec2a4927e..c41edf8427 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj @@ -87,7 +87,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Disabled ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -159,7 +159,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" MaxSpeed OnlyExplicitInline ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h index 909d7907d4..40c1ecde25 100644 --- a/src/include/switch_platform.h +++ b/src/include/switch_platform.h @@ -90,6 +90,9 @@ SWITCH_BEGIN_EXTERN_C #undef inline #define inline __inline #endif +#if defined(_MSC_VER) && _MSC_VER >= 1900 && !defined(_STDINT) +#include +#endif #if !defined(_STDINT) && !defined(uint32_t) typedef unsigned __int8 uint8_t; typedef unsigned __int16 uint16_t; diff --git a/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj b/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj index ca22084819..964914a216 100644 --- a/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj +++ b/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj @@ -77,6 +77,7 @@ $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast + _TIMESPEC_DEFINED;_DEBUG;DEBUG;%(PreprocessorDefinitions) false @@ -105,6 +106,7 @@ $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast + _TIMESPEC_DEFINED;NDEBUG;%(PreprocessorDefinitions) false diff --git a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj index ef67cfa8f6..53656c5ef7 100644 --- a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj +++ b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj @@ -73,7 +73,7 @@ Disabled ..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) - CURL_STATICLIB;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -115,7 +115,7 @@ MaxSpeed true ..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) - CURL_STATICLIB;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions) MultiThreadedDLL true Level3 diff --git a/src/mod/languages/mod_managed/Win32/Debug_CLR/.NETFramework,Version=v4.0.AssemblyAttributes.asm b/src/mod/languages/mod_managed/Win32/Debug_CLR/.NETFramework,Version=v4.0.AssemblyAttributes.asm new file mode 100644 index 0000000000..0f2a8fa3c3 --- /dev/null +++ b/src/mod/languages/mod_managed/Win32/Debug_CLR/.NETFramework,Version=v4.0.AssemblyAttributes.asm @@ -0,0 +1,4 @@ +; Listing generated by Microsoft (R) Optimizing Compiler Version 19.00.23026.0 + +; Generated by VC++ for Common Language Runtime +.file "C:\Users\mike\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cpp" diff --git a/src/mod/languages/mod_managed/Win32/Debug_CLR/.netframework,version=v4.0.assemblyattributes.nativecodeanalysis.xml b/src/mod/languages/mod_managed/Win32/Debug_CLR/.netframework,version=v4.0.assemblyattributes.nativecodeanalysis.xml new file mode 100644 index 0000000000..95d8ed98f0 --- /dev/null +++ b/src/mod/languages/mod_managed/Win32/Debug_CLR/.netframework,version=v4.0.assemblyattributes.nativecodeanalysis.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/mod/languages/mod_managed/Win32/Debug_CLR/freeswitch_managed.nativecodeanalysis.xml b/src/mod/languages/mod_managed/Win32/Debug_CLR/freeswitch_managed.nativecodeanalysis.xml new file mode 100644 index 0000000000..95d8ed98f0 --- /dev/null +++ b/src/mod/languages/mod_managed/Win32/Debug_CLR/freeswitch_managed.nativecodeanalysis.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/mod/languages/mod_managed/Win32/Debug_CLR/freeswitch_wrap.nativecodeanalysis.xml b/src/mod/languages/mod_managed/Win32/Debug_CLR/freeswitch_wrap.nativecodeanalysis.xml new file mode 100644 index 0000000000..95d8ed98f0 --- /dev/null +++ b/src/mod/languages/mod_managed/Win32/Debug_CLR/freeswitch_wrap.nativecodeanalysis.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/mod/languages/mod_managed/Win32/Debug_CLR/mod_managed.nativecodeanalysis.xml b/src/mod/languages/mod_managed/Win32/Debug_CLR/mod_managed.nativecodeanalysis.xml new file mode 100644 index 0000000000..95d8ed98f0 --- /dev/null +++ b/src/mod/languages/mod_managed/Win32/Debug_CLR/mod_managed.nativecodeanalysis.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/mod/languages/mod_managed/managed/examples/winFailToBan/winFailToBan.csproj b/src/mod/languages/mod_managed/managed/examples/winFailToBan/winFailToBan.csproj index 1e9289edac..250f105d3c 100644 --- a/src/mod/languages/mod_managed/managed/examples/winFailToBan/winFailToBan.csproj +++ b/src/mod/languages/mod_managed/managed/examples/winFailToBan/winFailToBan.csproj @@ -49,9 +49,9 @@ - + {834e2b2f-5483-4b80-8fe3-fe48ff76e5c0} - FreeSWITCH.Managed.2013 + FreeSWITCH.Managed.2015 diff --git a/src/switch.c b/src/switch.c index ab5ac1ac2c..bd8c73ae91 100644 --- a/src/switch.c +++ b/src/switch.c @@ -480,7 +480,7 @@ int main(int argc, char *argv[]) { char pid_path[PATH_MAX] = ""; /* full path to the pid file */ char pid_buffer[32] = ""; /* pid string */ - char old_pid_buffer[32] = ""; /* pid string */ + char old_pid_buffer[32] = { 0 }; /* pid string */ switch_size_t pid_len, old_pid_len; const char *err = NULL; /* error value for return from freeswitch initialization */ #ifndef WIN32 @@ -1213,7 +1213,7 @@ int main(int argc, char *argv[]) } if (destroy_status == SWITCH_STATUS_RESTART) { - char buf[1024] = ""; + char buf[1024] = { 0 }; int j = 0; switch_sleep(1000000); diff --git a/w32/Console/FreeSwitchConsole.2015.vcxproj b/w32/Console/FreeSwitchConsole.2015.vcxproj index e6c0d9e1c5..480c0c3486 100644 --- a/w32/Console/FreeSwitchConsole.2015.vcxproj +++ b/w32/Console/FreeSwitchConsole.2015.vcxproj @@ -95,6 +95,7 @@ true ProgramDatabase true + 6031;6340;6246;6011;6387;%(DisableSpecificWarnings) $(OutDir);%(AdditionalLibraryDirectories) @@ -146,6 +147,7 @@ Level4 true ProgramDatabase + 6031;6340;6246;6011;6387;%(DisableSpecificWarnings) $(OutDir);%(AdditionalLibraryDirectories)