Commit 616d4785 authored by atraczyk's avatar atraczyk

build: update visual studio project and fix some build issues

- adds rfc6062 patch for pjsip 2.5.5 for uwp
- updates files built by the vs project (adds some related to file
  transfer, removes those that are deprecated)
- corrects native build problems
- simplifies project layout
- links the minimal client with libdl(temp fix)

Change-Id: Ib82b0470f568cb79dc1f4353cb5a5ef20de93033
parent b7740bd1
......@@ -533,6 +533,116 @@
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\account.cpp" />
<ClCompile Include="..\src\account_factory.cpp" />
<ClCompile Include="..\src\archiver.cpp" />
<ClCompile Include="..\src\base64.cpp" />
<ClCompile Include="..\src\buildinfo.cpp" />
<ClCompile Include="..\src\call.cpp" />
<ClCompile Include="..\src\call_factory.cpp" />
<ClCompile Include="..\src\client\callmanager.cpp" />
<ClCompile Include="..\src\client\configurationmanager.cpp" />
<ClCompile Include="..\src\client\datatransfer.cpp" />
<ClCompile Include="..\src\client\presencemanager.cpp" />
<ClCompile Include="..\src\client\ring_signal.cpp" />
<ClCompile Include="..\src\client\videomanager.cpp" />
<ClCompile Include="..\src\conference.cpp" />
<ClCompile Include="..\src\config\yamlparser.cpp" />
<ClCompile Include="..\src\data_transfer.cpp" />
<ClCompile Include="..\src\dlfcn.c" />
<ClCompile Include="..\src\fileutils.cpp" />
<ClCompile Include="..\src\ftp_server.cpp" />
<ClCompile Include="..\src\hooks\urlhook.cpp" />
<ClCompile Include="..\src\ice_transport.cpp" />
<ClCompile Include="..\src\im\instant_messaging.cpp" />
<ClCompile Include="..\src\im\message_engine.cpp" />
<ClCompile Include="..\src\ip_utils.cpp" />
<ClCompile Include="..\src\logger.cpp" />
<ClCompile Include="..\src\manager.cpp" />
<ClCompile Include="..\src\media\audio\audiobuffer.cpp" />
<ClCompile Include="..\src\media\audio\audiolayer.cpp" />
<ClCompile Include="..\src\media\audio\audioloop.cpp" />
<ClCompile Include="..\src\media\audio\audiorecord.cpp" />
<ClCompile Include="..\src\media\audio\audiorecorder.cpp" />
<ClCompile Include="..\src\media\audio\audio_rtp_session.cpp" />
<ClCompile Include="..\src\media\audio\dcblocker.cpp" />
<ClCompile Include="..\src\media\audio\dsp.cpp" />
<ClCompile Include="..\src\media\audio\portaudio\portaudiolayer.cpp" />
<ClCompile Include="..\src\media\audio\resampler.cpp" />
<ClCompile Include="..\src\media\audio\ringbuffer.cpp" />
<ClCompile Include="..\src\media\audio\ringbufferpool.cpp" />
<ClCompile Include="..\src\media\audio\sound\audiofile.cpp" />
<ClCompile Include="..\src\media\audio\sound\dtmf.cpp" />
<ClCompile Include="..\src\media\audio\sound\dtmfgenerator.cpp" />
<ClCompile Include="..\src\media\audio\sound\tone.cpp" />
<ClCompile Include="..\src\media\audio\sound\tonelist.cpp" />
<ClCompile Include="..\src\media\audio\tonecontrol.cpp" />
<ClCompile Include="..\src\media\libav_utils.cpp" />
<ClCompile Include="..\src\media\media_buffer.cpp" />
<ClCompile Include="..\src\media\media_codec.cpp" />
<ClCompile Include="..\src\media\media_decoder.cpp" />
<ClCompile Include="..\src\media\media_encoder.cpp" />
<ClCompile Include="..\src\media\media_io_handle.cpp" />
<ClCompile Include="..\src\media\recordable.cpp" />
<ClCompile Include="..\src\media\socket_pair.cpp" />
<ClCompile Include="..\src\media\srtp.c" />
<ClCompile Include="..\src\media\system_codec_container.cpp" />
<ClCompile Include="..\src\media\video\accel.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\src\media\video\sinkclient.cpp" />
<ClCompile Include="..\src\media\video\uwpvideo\video_device_impl.cpp" />
<ClCompile Include="..\src\media\video\uwpvideo\video_device_monitor_impl.cpp" />
<ClCompile Include="..\src\media\video\video_base.cpp" />
<ClCompile Include="..\src\media\video\video_device_monitor.cpp" />
<ClCompile Include="..\src\media\video\video_input.cpp" />
<ClCompile Include="..\src\media\video\video_mixer.cpp" />
<ClCompile Include="..\src\media\video\video_receive_thread.cpp" />
<ClCompile Include="..\src\media\video\video_rtp_session.cpp" />
<ClCompile Include="..\src\media\video\video_scaler.cpp" />
<ClCompile Include="..\src\media\video\video_sender.cpp" />
<ClCompile Include="..\src\peer_connection.cpp" />
<ClCompile Include="..\src\preferences.cpp" />
<ClCompile Include="..\src\ringdht\accountarchive.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcore\Common.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcore\CommonData.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcore\FixedHash.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcore\SHA3.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcrypto\Common.cpp" />
<ClCompile Include="..\src\ringdht\namedirectory.cpp" />
<ClCompile Include="..\src\ringdht\p2p.cpp" />
<ClCompile Include="..\src\ringdht\ringaccount.cpp" />
<ClCompile Include="..\src\ringdht\sips_transport_ice.cpp" />
<ClCompile Include="..\src\ring_api.cpp" />
<ClCompile Include="..\src\security\certstore.cpp" />
<ClCompile Include="..\src\security\diffie-hellman.cpp" />
<ClCompile Include="..\src\security\memory.cpp" />
<ClCompile Include="..\src\security\tlsvalidator.cpp" />
<ClCompile Include="..\src\security\tls_session.cpp" />
<ClCompile Include="..\src\sip\pattern.cpp" />
<ClCompile Include="..\src\sip\pres_sub_client.cpp" />
<ClCompile Include="..\src\sip\pres_sub_server.cpp" />
<ClCompile Include="..\src\sip\sdes_negotiator.cpp" />
<ClCompile Include="..\src\sip\sdp.cpp" />
<ClCompile Include="..\src\sip\sipaccount.cpp" />
<ClCompile Include="..\src\sip\sipaccountbase.cpp" />
<ClCompile Include="..\src\sip\sipcall.cpp" />
<ClCompile Include="..\src\sip\sippresence.cpp" />
<ClCompile Include="..\src\sip\siptransport.cpp" />
<ClCompile Include="..\src\sip\sipvoiplink.cpp" />
<ClCompile Include="..\src\sip\sip_utils.cpp" />
<ClCompile Include="..\src\smartools.cpp" />
<ClCompile Include="..\src\string_utils.cpp" />
<ClCompile Include="..\src\threadloop.cpp" />
<ClCompile Include="..\src\thread_pool.cpp" />
<ClCompile Include="..\src\turn_transport.cpp" />
<ClCompile Include="..\src\upnp\upnp_context.cpp" />
<ClCompile Include="..\src\upnp\upnp_control.cpp" />
<ClCompile Include="..\src\upnp\upnp_igd.cpp" />
<ClCompile Include="..\src\utf8_utils.cpp" />
<ClCompile Include="..\src\winsyslog.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\account.h" />
<ClInclude Include="..\src\account_factory.h" />
......@@ -542,28 +652,30 @@
<ClInclude Include="..\src\base64.h" />
<ClInclude Include="..\src\call.h" />
<ClInclude Include="..\src\call_factory.h" />
<ClInclude Include="..\src\channel.h" />
<ClInclude Include="..\src\client\ring_signal.h" />
<ClInclude Include="..\src\client\videomanager.h" />
<ClInclude Include="..\src\compiler_intrinsics.h" />
<ClInclude Include="..\src\conference.h" />
<ClInclude Include="..\src\config\serializable.h" />
<ClInclude Include="..\src\config\yamlparser.h" />
<ClInclude Include="..\src\dirent.h" />
<ClInclude Include="..\src\dlfcn.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="..\src\data_transfer.h" />
<ClInclude Include="..\src\dlfcn.h" />
<ClInclude Include="..\src\dring\account_const.h" />
<ClInclude Include="..\src\dring\callmanager_interface.h" />
<ClInclude Include="..\src\dring\call_const.h" />
<ClInclude Include="..\src\dring\configurationmanager_interface.h" />
<ClInclude Include="..\src\dring\datatransfer_interface.h" />
<ClInclude Include="..\src\dring\dring.h" />
<ClInclude Include="..\src\dring\media_const.h" />
<ClInclude Include="..\src\dring\presencemanager_interface.h" />
<ClInclude Include="..\src\dring\presence_const.h" />
<ClInclude Include="..\src\dring\security_const.h" />
<ClInclude Include="..\src\dring\videomanager_interface.h" />
<ClInclude Include="..\src\enumclass_utils.h" />
<ClInclude Include="..\src\fileutils.h" />
<ClInclude Include="..\src\ftp_server.h" />
<ClInclude Include="..\src\generic_io.h" />
<ClInclude Include="..\src\hooks\urlhook.h" />
<ClInclude Include="..\src\ice_socket.h" />
<ClInclude Include="..\src\ice_transport.h" />
......@@ -591,6 +703,7 @@
<ClInclude Include="..\src\media\audio\sound\tone.h" />
<ClInclude Include="..\src\media\audio\sound\tonelist.h" />
<ClInclude Include="..\src\media\audio\tonecontrol.h" />
<ClInclude Include="..\src\media\decoder_finder.h" />
<ClInclude Include="..\src\media\libav_deps.h" />
<ClInclude Include="..\src\media\libav_utils.h" />
<ClInclude Include="..\src\media\media_buffer.h" />
......@@ -604,6 +717,9 @@
<ClInclude Include="..\src\media\socket_pair.h" />
<ClInclude Include="..\src\media\srtp.h" />
<ClInclude Include="..\src\media\system_codec_container.h" />
<ClInclude Include="..\src\media\video\accel.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="..\src\media\video\shm_header.h" />
<ClInclude Include="..\src\media\video\sinkclient.h" />
<ClInclude Include="..\src\media\video\video_base.h" />
......@@ -616,14 +732,7 @@
<ClInclude Include="..\src\media\video\video_scaler.h" />
<ClInclude Include="..\src\media\video\video_sender.h" />
<ClInclude Include="..\src\noncopyable.h" />
<ClInclude Include="..\src\plugin_loader.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="..\src\plugin_manager.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="..\src\peer_connection.h" />
<ClInclude Include="..\src\preferences.h" />
<ClInclude Include="..\src\rational.h" />
<ClInclude Include="..\src\registration_states.h" />
......@@ -637,10 +746,10 @@
<ClInclude Include="..\src\ringdht\eth\libdevcore\vector_ref.h" />
<ClInclude Include="..\src\ringdht\eth\libdevcrypto\Common.h" />
<ClInclude Include="..\src\ringdht\namedirectory.h" />
<ClInclude Include="..\src\ringdht\p2p.h" />
<ClInclude Include="..\src\ringdht\ringaccount.h" />
<ClInclude Include="..\src\ringdht\ringcontact.h" />
<ClInclude Include="..\src\ringdht\sips_transport_ice.h" />
<ClInclude Include="..\src\ring_plugin.h" />
<ClInclude Include="..\src\ring_types.h" />
<ClInclude Include="..\src\rw_mutex.h" />
<ClInclude Include="..\src\security\certstore.h" />
......@@ -664,126 +773,16 @@
<ClInclude Include="..\src\string_utils.h" />
<ClInclude Include="..\src\threadloop.h" />
<ClInclude Include="..\src\thread_pool.h" />
<ClInclude Include="..\src\turn_transport.h" />
<ClInclude Include="..\src\upnp\upnp_context.h" />
<ClInclude Include="..\src\upnp\upnp_control.h" />
<ClInclude Include="..\src\upnp\upnp_igd.h" />
<ClInclude Include="..\src\utf8_utils.h" />
<ClInclude Include="..\src\windirent.h" />
<ClInclude Include="..\src\winsyslog.h" />
<ClInclude Include="config.h" />
<ClInclude Include="sys_time.h" />
<ClInclude Include="unistd.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\account.cpp" />
<ClCompile Include="..\src\account_factory.cpp" />
<ClCompile Include="..\src\archiver.cpp" />
<ClCompile Include="..\src\base64.cpp" />
<ClCompile Include="..\src\buildinfo.cpp" />
<ClCompile Include="..\src\call.cpp" />
<ClCompile Include="..\src\call_factory.cpp" />
<ClCompile Include="..\src\client\callmanager.cpp" />
<ClCompile Include="..\src\client\configurationmanager.cpp" />
<ClCompile Include="..\src\client\presencemanager.cpp" />
<ClCompile Include="..\src\client\ring_signal.cpp" />
<ClCompile Include="..\src\client\videomanager.cpp" />
<ClCompile Include="..\src\conference.cpp" />
<ClCompile Include="..\src\config\yamlparser.cpp" />
<ClCompile Include="..\src\dlfcn.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\src\fileutils.cpp" />
<ClCompile Include="..\src\hooks\urlhook.cpp" />
<ClCompile Include="..\src\ice_transport.cpp" />
<ClCompile Include="..\src\im\instant_messaging.cpp" />
<ClCompile Include="..\src\im\message_engine.cpp" />
<ClCompile Include="..\src\ip_utils.cpp" />
<ClCompile Include="..\src\logger.cpp" />
<ClCompile Include="..\src\manager.cpp" />
<ClCompile Include="..\src\media\audio\audiobuffer.cpp" />
<ClCompile Include="..\src\media\audio\audiolayer.cpp" />
<ClCompile Include="..\src\media\audio\audioloop.cpp" />
<ClCompile Include="..\src\media\audio\audiorecord.cpp" />
<ClCompile Include="..\src\media\audio\audiorecorder.cpp" />
<ClCompile Include="..\src\media\audio\audio_rtp_session.cpp" />
<ClCompile Include="..\src\media\audio\dcblocker.cpp" />
<ClCompile Include="..\src\media\audio\dsp.cpp" />
<ClCompile Include="..\src\media\audio\portaudio\portaudiolayer.cpp" />
<ClCompile Include="..\src\media\audio\resampler.cpp" />
<ClCompile Include="..\src\media\audio\ringbuffer.cpp" />
<ClCompile Include="..\src\media\audio\ringbufferpool.cpp" />
<ClCompile Include="..\src\media\audio\sound\audiofile.cpp" />
<ClCompile Include="..\src\media\audio\sound\dtmf.cpp" />
<ClCompile Include="..\src\media\audio\sound\dtmfgenerator.cpp" />
<ClCompile Include="..\src\media\audio\sound\tone.cpp" />
<ClCompile Include="..\src\media\audio\sound\tonelist.cpp" />
<ClCompile Include="..\src\media\audio\tonecontrol.cpp" />
<ClCompile Include="..\src\media\libav_utils.cpp" />
<ClCompile Include="..\src\media\media_buffer.cpp" />
<ClCompile Include="..\src\media\media_codec.cpp" />
<ClCompile Include="..\src\media\media_decoder.cpp" />
<ClCompile Include="..\src\media\media_encoder.cpp" />
<ClCompile Include="..\src\media\media_io_handle.cpp" />
<ClCompile Include="..\src\media\recordable.cpp" />
<ClCompile Include="..\src\media\socket_pair.cpp" />
<ClCompile Include="..\src\media\srtp.c" />
<ClCompile Include="..\src\media\system_codec_container.cpp" />
<ClCompile Include="..\src\media\video\sinkclient.cpp" />
<ClCompile Include="..\src\media\video\uwpvideo\video_device_impl.cpp" />
<ClCompile Include="..\src\media\video\uwpvideo\video_device_monitor_impl.cpp" />
<ClCompile Include="..\src\media\video\video_base.cpp" />
<ClCompile Include="..\src\media\video\video_device_monitor.cpp" />
<ClCompile Include="..\src\media\video\video_input.cpp" />
<ClCompile Include="..\src\media\video\video_mixer.cpp" />
<ClCompile Include="..\src\media\video\video_receive_thread.cpp" />
<ClCompile Include="..\src\media\video\video_rtp_session.cpp" />
<ClCompile Include="..\src\media\video\video_scaler.cpp" />
<ClCompile Include="..\src\media\video\video_sender.cpp" />
<ClCompile Include="..\src\plugin_loader_dl.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\src\plugin_manager.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\src\preferences.cpp" />
<ClCompile Include="..\src\ringdht\accountarchive.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcore\Common.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcore\CommonData.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcore\FixedHash.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcore\SHA3.cpp" />
<ClCompile Include="..\src\ringdht\eth\libdevcrypto\Common.cpp" />
<ClCompile Include="..\src\ringdht\namedirectory.cpp" />
<ClCompile Include="..\src\ringdht\ringaccount.cpp" />
<ClCompile Include="..\src\ringdht\sips_transport_ice.cpp" />
<ClCompile Include="..\src\ring_api.cpp" />
<ClCompile Include="..\src\security\certstore.cpp" />
<ClCompile Include="..\src\security\diffie-hellman.cpp" />
<ClCompile Include="..\src\security\memory.cpp" />
<ClCompile Include="..\src\security\tlsvalidator.cpp" />
<ClCompile Include="..\src\security\tls_session.cpp" />
<ClCompile Include="..\src\sip\pattern.cpp" />
<ClCompile Include="..\src\sip\pres_sub_client.cpp" />
<ClCompile Include="..\src\sip\pres_sub_server.cpp" />
<ClCompile Include="..\src\sip\sdes_negotiator.cpp" />
<ClCompile Include="..\src\sip\sdp.cpp" />
<ClCompile Include="..\src\sip\sipaccount.cpp" />
<ClCompile Include="..\src\sip\sipaccountbase.cpp" />
<ClCompile Include="..\src\sip\sipcall.cpp" />
<ClCompile Include="..\src\sip\sippresence.cpp" />
<ClCompile Include="..\src\sip\siptransport.cpp" />
<ClCompile Include="..\src\sip\sipvoiplink.cpp" />
<ClCompile Include="..\src\sip\sip_utils.cpp" />
<ClCompile Include="..\src\smartools.cpp" />
<ClCompile Include="..\src\string_utils.cpp" />
<ClCompile Include="..\src\threadloop.cpp" />
<ClCompile Include="..\src\thread_pool.cpp" />
<ClCompile Include="..\src\upnp\upnp_context.cpp" />
<ClCompile Include="..\src\upnp\upnp_control.cpp" />
<ClCompile Include="..\src\upnp\upnp_igd.cpp" />
<ClCompile Include="..\src\utf8_utils.cpp" />
<ClCompile Include="..\src\winsyslog.c" />
<None Include="..\src\ringdht\eth\libdevcore\Makefile.am" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
......
This diff is collapsed.
......@@ -31,7 +31,7 @@ dring_CXXFLAGS= -I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
-I$(top_srcdir)/src/dring \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
dring_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la
dring_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la -ldl
endif
if RING_NODEJS
......
......@@ -30,15 +30,6 @@ build\libupnp\build\VS2015\ixml.vcxproj, ^
build\libupnp\build\VS2015\threadutil.vcxproj, ^
build\libupnp\build\VS2015\libupnp.vcxproj, ^
build\pcre\MSVC\pcre.vcxproj, ^
build\pjproject\third_party\build\baseclasses\libbaseclasses.vcxproj, ^
build\pjproject\third_party\build\g7221\libg7221codec.vcxproj, ^
build\pjproject\third_party\build\gsm\libgsmcodec.vcxproj, ^
build\pjproject\third_party\build\ilbc\libilbccodec.vcxproj, ^
build\pjproject\third_party\build\milenage\libmilenage.vcxproj, ^
build\pjproject\third_party\build\resample\libresample.vcxproj, ^
build\pjproject\third_party\build\speex\libspeex.vcxproj, ^
build\pjproject\third_party\build\srtp\libsrtp.vcxproj, ^
build\pjproject\third_party\build\yuv\libyuv.vcxproj, ^
build\pjproject\pjlib-util\build\pjlib-util.vcxproj, ^
build\pjproject\pjmedia\build\pjmedia.vcxproj, ^
build\pjproject\pjmedia\build\pjmedia_audiodev.vcxproj, ^
......
......@@ -26,5 +26,6 @@ git apply --reject --whitespace=fix %SRC%\pjproject\add_dtls_transport.patch
git apply --reject --whitespace=fix %SRC%\pjproject\pj_uwp_ice_sess.patch
git apply --reject --whitespace=fix %SRC%\pjproject\pj_uwp_fix_turn_fallback.patch
git apply --reject --whitespace=fix %SRC%\pjproject\pj_uwp.patch
git apply --reject --whitespace=fix %SRC%\pjproject\pj_uwp_rfc6062.patch
cd %SRC%
\ No newline at end of file
This diff is collapsed.
......@@ -44,7 +44,9 @@
#include <sys/select.h>
#endif
#ifndef RING_UWP
#include <sys/time.h>
#endif
namespace ring {
......@@ -220,7 +222,7 @@ TlsTurnEndpoint::waitForData(unsigned ms_timeout, std::error_code& ec) const
TcpSocketEndpoint::TcpSocketEndpoint(const IpAddr& addr)
: addr_ {addr}
, sock_ {::socket(addr.getFamily(), SOCK_STREAM, 0)}
, sock_{ static_cast<int>(::socket(addr.getFamily(), SOCK_STREAM, 0)) }
{
if (sock_ < 0)
std::system_error(errno, std::generic_category());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment