提交 fd7d5e08 authored 作者: Jeff Lenk's avatar Jeff Lenk

windows compiler fixes - now builds again

上级 576cb892
......@@ -340,6 +340,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="srtp\ekt.c" />
<ClCompile Include="srtp\srtp.c" />
<ClCompile Include="crypto\kernel\alloc.c" />
<ClCompile Include="crypto\kernel\crypto_kernel.c" />
......
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Dll|Win32">
......@@ -348,6 +348,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="srtp\ekt.c" />
<ClCompile Include="srtp\srtp.c" />
<ClCompile Include="crypto\kernel\alloc.c" />
<ClCompile Include="crypto\kernel\crypto_kernel.c" />
......@@ -417,4 +418,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -47,6 +47,10 @@
#include "srtp_priv.h"
#include "ekt.h"
#ifdef _MSC_VER
#pragma warning(disable:4100)
#endif
extern debug_module_t mod_srtp;
/*
......
......@@ -1814,6 +1814,13 @@ static int dtls_ok(switch_core_session_t *session)
return switch_channel_test_flag(session->channel, CF_DTLS_OK);
}
#ifdef _MSC_VER
/* remove this if the break is removed from the following for loop which causes unreachable code loop */
/* for (i = 0; i < engine->cand_acl_count; i++) { */
#pragma warning(push)
#pragma warning(disable:4702)
#endif
//?
static void check_ice(switch_media_handle_t *smh, switch_media_type_t type, sdp_session_t *sdp, sdp_media_t *m)
{
......@@ -2051,6 +2058,9 @@ static void check_ice(switch_media_handle_t *smh, switch_media_type_t type, sdp_
}
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif
SWITCH_DECLARE(void) switch_core_session_set_ice(switch_core_session_t *session)
{
......@@ -6968,6 +6978,13 @@ SWITCH_DECLARE(void) switch_core_media_check_outgoing_proxy(switch_core_session_
}
}
#ifdef _MSC_VER
/* remove this if the break is removed from the following for loop which causes unreachable code loop */
/* for (m = sdp->sdp_media; m; m = m->m_next) { */
#pragma warning(push)
#pragma warning(disable:4702)
#endif
//?
SWITCH_DECLARE(void) switch_core_media_proxy_codec(switch_core_session_t *session, const char *r_sdp)
{
......@@ -7038,6 +7055,9 @@ SWITCH_DECLARE(void) switch_core_media_proxy_codec(switch_core_session_t *sessio
sdp_parser_free(parser);
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif
SWITCH_DECLARE (void) switch_core_media_recover_session(switch_core_session_t *session)
{
......
......@@ -17,3 +17,7 @@ sdp_connection_t *sdp_media_connections(sdp_media_t const *m)
#include <su_errno.c>
#include <su_string.c>
#include <sdp_parse.c>
#ifdef _MSC_VER
#define longlong __int64
#include <strtoull.c>
#endif
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论