Fix build warning and error for UWP (#3276)

* Fix build warning and error for UWP

* Include in6_addr.h directly on UWP
remotes/origin/ip-change-early
Riza Sulistyo 2 years ago committed by GitHub
parent 31874008d1
commit 74569f926a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -58,6 +58,7 @@
#define PJ_HAS_SYS_TYPES_H 0 /* Doesn't have sys/types.h */
#define PJ_HAS_TIME_H 1
#define PJ_HAS_UNISTD_H 0
#define PJ_HAS_LIMITS_H 1
#define PJ_HAS_MSWSOCK_H 1
#define PJ_HAS_WINSOCK_H 0

@ -37,6 +37,9 @@
# include <ws2tcpip.h>
#endif
#if (defined(PJ_WIN32_UWP) && PJ_WIN32_UWP!=0)
# include <in6addr.h>
#endif
/*
* IPv6 for Visual Studio's

@ -586,6 +586,8 @@ PJ_DEF(pj_status_t) pj_enum_ip_interface2( const pj_enum_ip_option *opt,
pj_enum_ip_option_default(&opt_);
if (opt_.af != pj_AF_INET() && opt_.omit_deprecated_ipv6) {
#if defined(PJ_LINUX) && PJ_LINUX!=0
pj_sockaddr addrs[*p_cnt];
pj_sockaddr deprecatedAddrs[*p_cnt];
unsigned deprecatedCount = *p_cnt;
@ -619,6 +621,9 @@ PJ_DEF(pj_status_t) pj_enum_ip_interface2( const pj_enum_ip_option *opt,
*p_cnt = cnt;
return *p_cnt ? PJ_SUCCESS : PJ_ENOTFOUND;
#else
return PJ_ENOTSUP;
#endif
}
return pj_enum_ip_interface(opt_.af, p_cnt, ifs);

@ -469,6 +469,12 @@ typedef HRESULT(WINAPI *FnSetThreadDescription)(HANDLE hThread,
static void set_thread_display_name(const char *name)
{
#if (defined(PJ_WIN32_UWP) && PJ_WIN32_UWP!=0) || \
(defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8!=0)
return;
#else
/* Set thread name by SetThreadDescription (if support) */
FnSetThreadDescription fn = (FnSetThreadDescription)GetProcAddress(
GetModuleHandle(PJ_T("Kernel32.dll")), "SetThreadDescription");
@ -507,6 +513,8 @@ static void set_thread_display_name(const char *name)
#pragma warning(pop)
}
# endif
#endif
}
static DWORD WINAPI thread_main(void *param)

@ -212,6 +212,7 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<OutputFile>..\lib\pjsua-cli-uwp-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll</OutputFile>
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">

@ -197,6 +197,7 @@
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">

Loading…
Cancel
Save