summaryrefslogtreecommitdiff
path: root/cppe/src/TcpTransport/Connector.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cppe/src/TcpTransport/Connector.cpp')
-rw-r--r--cppe/src/TcpTransport/Connector.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/cppe/src/TcpTransport/Connector.cpp b/cppe/src/TcpTransport/Connector.cpp
index 1825301e8fe..33f5876b34c 100644
--- a/cppe/src/TcpTransport/Connector.cpp
+++ b/cppe/src/TcpTransport/Connector.cpp
@@ -34,7 +34,14 @@ Connector::connect(int timeout)
SOCKET fd = createSocket();
setBlock(fd, false);
doConnect(fd, _addr, timeout);
+#if !defined(_WIN32) || defined(ICEE_USE_SOCKET_TIMEOUT)
+ //
+ // TODO: We can't use blocking sockets on Windows yet because
+ // the transceiver is using WSAEventSelect (which doesn't play
+ // well with blocking sockets).
+ //
setBlock(fd, true);
+#endif
if(_traceLevels->network >= 1)
{