Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed WaitOnConnect() in non GUI mode (patch 905185)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-15 22:56:26 +00:00
parent af498247c5
commit f6a9c02577
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/gsocket.c
View File

@@ -780,7 +780,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
FD_ZERO(&writefds); FD_ZERO(&writefds);
FD_ZERO(&exceptfds); FD_ZERO(&exceptfds);
FD_SET(socket->m_fd, &readfds); FD_SET(socket->m_fd, &readfds);
if (flags & GSOCK_OUTPUT_FLAG) if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)
FD_SET(socket->m_fd, &writefds); FD_SET(socket->m_fd, &writefds);
FD_SET(socket->m_fd, &exceptfds); FD_SET(socket->m_fd, &exceptfds);

6
src/unix/gsocket.c
View File

@@ -913,17 +913,17 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
fd_set exceptfds; fd_set exceptfds;
struct timeval tv; struct timeval tv;
assert(socket != NULL);
/* Do not use a static struct, Linux can garble it */ /* Do not use a static struct, Linux can garble it */
tv.tv_sec = socket->m_timeout / 1000; tv.tv_sec = socket->m_timeout / 1000;
tv.tv_usec = (socket->m_timeout % 1000) / 1000; tv.tv_usec = (socket->m_timeout % 1000) / 1000;
assert(socket != NULL);
FD_ZERO(&readfds); FD_ZERO(&readfds);
FD_ZERO(&writefds); FD_ZERO(&writefds);
FD_ZERO(&exceptfds); FD_ZERO(&exceptfds);
FD_SET(socket->m_fd, &readfds); FD_SET(socket->m_fd, &readfds);
if (flags & GSOCK_OUTPUT_FLAG) if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)
FD_SET(socket->m_fd, &writefds); FD_SET(socket->m_fd, &writefds);
FD_SET(socket->m_fd, &exceptfds); FD_SET(socket->m_fd, &exceptfds);