swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-10-08 00:12:55 -04:00
Code Issues Projects Releases Wiki Activity

we can now build with gcc6/stdc++6

Browse Source
This commit is contained in:
DarthArgus
2016-12-15 03:02:36 +00:00
parent 87f0d4d744
commit 1c6a70a87e
5 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedNetwork/src/linux/TcpClient.cpp
+2 -2
View File
@@ -373,7 +373,7 @@ void TcpClient::queryConnect ()
pfd.fd = m_socket;
pfd.events = POLLOUT;
pfd.revents = 0;
int pollResult = poll(&pfd, 1, 3000);
int pollResult = poll(&pfd, 1, 0);
if(pollResult > 0)
{
if (pfd.revents & POLLERR)
@@ -483,7 +483,7 @@ void TcpClient::update()
pfd.fd = m_socket;
pfd.events = POLLIN|POLLHUP;
pfd.revents = 0;
int pollResult = poll (&pfd, 1, 3000);
int pollResult = poll (&pfd, 1, 0);
// POLLERR is mutually exclusive with POLLIN and POLLHUP.
// POLLIN and POLLHUP are not consistent cross-platform. Additionally,
// a POLLHUP doesn't mean that there's not data available. The best,