diff options
Diffstat (limited to 'cppe/src')
| -rw-r--r-- | cppe/src/IceE/Network.cpp | 2 | ||||
| -rw-r--r-- | cppe/src/TcpTransport/Transceiver.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/cppe/src/IceE/Network.cpp b/cppe/src/IceE/Network.cpp index 5f042514867..eb138a38338 100644 --- a/cppe/src/IceE/Network.cpp +++ b/cppe/src/IceE/Network.cpp @@ -510,7 +510,6 @@ repeatConnect: throw ex; } -#ifdef ICEE_USE_SOCKET_TIMEOUT // // This is necessary to be able to set the socket in blocking mode. // @@ -525,7 +524,6 @@ repeatConnect: ex.error = error; throw ex; } -#endif // // Now we close the event, because we're finished and diff --git a/cppe/src/TcpTransport/Transceiver.cpp b/cppe/src/TcpTransport/Transceiver.cpp index 3481f20239b..596d4c3da8c 100644 --- a/cppe/src/TcpTransport/Transceiver.cpp +++ b/cppe/src/TcpTransport/Transceiver.cpp @@ -39,7 +39,7 @@ IceInternal::Transceiver::close() out << "closing tcp connection\n" << toString(); } -#ifdef ICEE_USE_SOCKET_TIMEOUT +#ifdef ICEE_USE_SELECT_FOR_TIMEOUTS #ifdef _WIN32 assert(_event != 0); WSACloseEvent(_event); @@ -95,7 +95,7 @@ IceInternal::Transceiver::write(Buffer& buf, int timeout) { Buffer::Container::difference_type packetSize = static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i); - + #ifdef _WIN32 // // Limit packet size to avoid performance problems on WIN32 @@ -405,7 +405,7 @@ IceInternal::Transceiver::Transceiver(const InstancePtr& instance, SOCKET fd, in IceInternal::Transceiver::~Transceiver() { assert(_fd == INVALID_SOCKET); -#ifdef ICEE_USE_SOCKET_TIMEOUT +#ifdef ICEE_USE_SELECT_FOR_TIMEOUTS #ifdef _WIN32 assert(_event == 0); assert(_readEvent == 0); |