From 74569f926a2f553006d4bbac70c7371dfb1eb400 Mon Sep 17 00:00:00 2001
From: Riza Sulistyo <trengginas@users.noreply.github.com>
Date: Thu, 27 Oct 2022 10:47:21 +0700
Subject: [PATCH] Fix build warning and error for UWP (#3276)

* Fix build warning and error for UWP

* Include in6_addr.h directly on UWP
---
 pjlib/include/pj/compat/os_winuwp.h                       | 1 +
 pjlib/include/pj/compat/socket.h                          | 3 +++
 pjlib/src/pj/ip_helper_generic.c                          | 5 +++++
 pjlib/src/pj/os_core_win32.c                              | 8 ++++++++
 .../src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj   | 7 ++++---
 .../pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj   | 5 +++--
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/pjlib/include/pj/compat/os_winuwp.h b/pjlib/include/pj/compat/os_winuwp.h
index 9cc8ee96b..b14b6b684 100644
--- a/pjlib/include/pj/compat/os_winuwp.h
+++ b/pjlib/include/pj/compat/os_winuwp.h
@@ -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
diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h
index 659a4bbc7..66c03fa5a 100644
--- a/pjlib/include/pj/compat/socket.h
+++ b/pjlib/include/pj/compat/socket.h
@@ -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
diff --git a/pjlib/src/pj/ip_helper_generic.c b/pjlib/src/pj/ip_helper_generic.c
index ab441a504..b47d9fba9 100644
--- a/pjlib/src/pj/ip_helper_generic.c
+++ b/pjlib/src/pj/ip_helper_generic.c
@@ -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);
diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c
index cbc1bcb77..a4e3d66ea 100644
--- a/pjlib/src/pj/os_core_win32.c
+++ b/pjlib/src/pj/os_core_win32.c
@@ -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");
@@ -506,6 +512,8 @@ static void set_thread_display_name(const char *name)
 	}
 #pragma warning(pop)
     }
+#  endif
+
 #endif
 }
 
diff --git a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj
index 7a94ba74e..d901ab91a 100644
--- a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj
+++ b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj
@@ -109,7 +109,7 @@
   </ImportGroup>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <Import Project="pjsua_cli_shared_comp.vcxitems" Label="Shared" />  
+  <Import Project="pjsua_cli_shared_comp.vcxitems" Label="Shared" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -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'">
@@ -268,10 +269,10 @@
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <OutputFile>..\lib\pjsua-cli-uwp-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll</OutputFile>
     </Link>
-  </ItemDefinitionGroup>  
+  </ItemDefinitionGroup>
   <!--Don't build this project unless it's for UWP-->
   <Import Condition="'$(API_Family)'=='UWP'" Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Condition="'$(API_Family)'!='UWP'" Project="..\..\..\..\..\..\build\vs\pjproject-vs14-build-targets.targets" />                                     
+  <Import Condition="'$(API_Family)'!='UWP'" Project="..\..\..\..\..\..\build\vs\pjproject-vs14-build-targets.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj
index 0e4c63071..0c00b3432 100644
--- a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj
+++ b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj
@@ -92,7 +92,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
-  </ImportGroup>  
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-arm-common-defaults.props" />
     <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
@@ -104,7 +104,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
-  </ImportGroup>  
+  </ImportGroup>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
@@ -197,6 +197,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">