zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Fixed __ANDROID_API__ < 21 build and FD_SET usage.

Browse Source
This commit is contained in:
Till Rathmann
2018-08-01 19:18:40 +02:00
parent df09fe48cf
commit 3b302315f9
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/TracySocket.cpp
+9 -3
View File
@@ -25,6 +25,12 @@
namespace tracy
{
#ifdef _MSC_VER
typedef SOCKET socket_t;
#else
typedef int socket_t;
#endif
#ifdef _MSC_VER
struct __wsinit
{
@@ -174,7 +180,7 @@ int Socket::Recv( void* _buf, int len, const timeval* tv )
fd_set fds;
FD_ZERO( &fds );
FD_SET( static_cast<unsigned int>(m_sock), &fds );
FD_SET( static_cast<socket_t>(m_sock), &fds );
#ifndef _WIN32
timeval _tv = *tv;
@@ -231,7 +237,7 @@ bool Socket::HasData()
fd_set fds;
FD_ZERO( &fds );
FD_SET( static_cast<unsigned int>(m_sock), &fds );
FD_SET( static_cast<socket_t>(m_sock), &fds );
return select( m_sock+1, &fds, nullptr, nullptr, &tv ) > 0;
}
@@ -287,7 +293,7 @@ Socket* ListenSocket::Accept()
fd_set fds;
FD_ZERO( &fds );
FD_SET( static_cast<unsigned int>(m_sock), &fds );
FD_SET( static_cast<socket_t>(m_sock), &fds );
select( m_sock+1, &fds, nullptr, nullptr, &tv );
if( FD_ISSET( m_sock, &fds ) )