ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 13:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-7966: multiple fixes for msvc 2015 build

Browse Source
This commit is contained in:
Mike Jerris
2015-08-27 14:34:45 -06:00
parent ea38fe940b
commit 9485fc9581
17 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/switch_platform.h
+3
View File
@@ -90,6 +90,9 @@ SWITCH_BEGIN_EXTERN_C
#undef inline
#define inline __inline
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1900 && !defined(_STDINT)
#include <stdint.h>
#endif
#if !defined(_STDINT) && !defined(uint32_t)
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj
+2
View File
@@ -77,6 +77,7 @@
<PrecompiledHeader>
</PrecompiledHeader>
<AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_TIMESPEC_DEFINED;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -105,6 +106,7 @@
<PrecompiledHeader>
</PrecompiledHeader>
<AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_TIMESPEC_DEFINED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
src/mod/formats/mod_shout/mod_shout.2015.vcxproj
+2 -2
View File
@@ -73,7 +73,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -115,7 +115,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\..\..\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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
src/mod/languages/mod_managed/Win32/Debug_CLR/.NETFramework,Version=v4.0.AssemblyAttributes.asm
+4
View File
@@ -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"
src/mod/languages/mod_managed/Win32/Debug_CLR/.netframework,version=v4.0.assemblyattributes.nativecodeanalysis.xml
+2
View File
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<DEFECTS></DEFECTS>
src/mod/languages/mod_managed/Win32/Debug_CLR/freeswitch_managed.nativecodeanalysis.xml
+2
View File
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<DEFECTS></DEFECTS>
src/mod/languages/mod_managed/Win32/Debug_CLR/freeswitch_wrap.nativecodeanalysis.xml
+2
View File
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<DEFECTS></DEFECTS>
src/mod/languages/mod_managed/Win32/Debug_CLR/mod_managed.nativecodeanalysis.xml
+2
View File
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<DEFECTS></DEFECTS>
src/mod/languages/mod_managed/managed/examples/winFailToBan/winFailToBan.csproj
+2 -2
View File
@@ -49,9 +49,9 @@
<None Include="skel.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\FreeSWITCH.Managed.2013.csproj">
<ProjectReference Include="..\..\FreeSWITCH.Managed.2015.csproj">
<Project>{834e2b2f-5483-4b80-8fe3-fe48ff76e5c0}</Project>
<Name>FreeSWITCH.Managed.2013</Name>
<Name>FreeSWITCH.Managed.2015</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
src/switch.c
+2 -2
View File
@@ -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);