diff options
author | Benoit Foucher <benoit@zeroc.com> | 2006-02-20 10:46:25 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2006-02-20 10:46:25 +0000 |
commit | 0be7ce7567b38dcad984cb16d88e8e4f4ff1fb09 (patch) | |
tree | 1a7cb555bd4e7e445cbde23fed8c4f17762fab4f /cppe/src/TcpTransport/Transceiver.cpp | |
parent | Use socket timeouts by default. (diff) | |
download | ice-0be7ce7567b38dcad984cb16d88e8e4f4ff1fb09.tar.bz2 ice-0be7ce7567b38dcad984cb16d88e8e4f4ff1fb09.tar.xz ice-0be7ce7567b38dcad984cb16d88e8e4f4ff1fb09.zip |
Win32 fix for socket timeouts.
Diffstat (limited to 'cppe/src/TcpTransport/Transceiver.cpp')
-rw-r--r-- | cppe/src/TcpTransport/Transceiver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |