diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-07-06 17:07:03 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-07-06 17:07:03 +0000 |
| commit | e27477392c54f347cf74964cb2795c4e26757ab3 (patch) | |
| tree | 8097ff9ddd121235d91511e43dc5b5533c3b6bb6 /cppe/src/TcpTransport/Transceiver.cpp | |
| parent | Fixed namespace (diff) | |
| download | ice-e27477392c54f347cf74964cb2795c4e26757ab3.tar.bz2 ice-e27477392c54f347cf74964cb2795c4e26757ab3.tar.xz ice-e27477392c54f347cf74964cb2795c4e26757ab3.zip | |
more changes for http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=402
Diffstat (limited to 'cppe/src/TcpTransport/Transceiver.cpp')
| -rw-r--r-- | cppe/src/TcpTransport/Transceiver.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cppe/src/TcpTransport/Transceiver.cpp b/cppe/src/TcpTransport/Transceiver.cpp index ac3fb02dcd7..8e0325f1802 100644 --- a/cppe/src/TcpTransport/Transceiver.cpp +++ b/cppe/src/TcpTransport/Transceiver.cpp @@ -40,7 +40,7 @@ IceInternal::Transceiver::close() out << "closing tcp connection\n" << toString(); } -#ifdef _WIN32_WCE +#ifdef _WIN32 assert(_event != 0); WSACloseEvent(_event); _event = 0; @@ -115,7 +115,7 @@ IceInternal::Transceiver::write(Buffer& buf, int timeout) if(ret == SOCKET_ERROR) { -#ifdef _WIN32_WCE
+#ifdef _WIN32 repeatError: #endif
if(interrupted()) @@ -131,7 +131,7 @@ IceInternal::Transceiver::write(Buffer& buf, int timeout) if(wouldBlock()) { -#ifdef _WIN32_WCE +#ifdef _WIN32 WSAEVENT events[1]; events[0] = _event; long tout = (timeout >= 0) ? timeout : WSA_INFINITE; @@ -278,7 +278,7 @@ IceInternal::Transceiver::read(Buffer& buf, int timeout) if(ret == SOCKET_ERROR) { -#ifdef _WIN32_WCE
+#ifdef _WIN32 repeatError: #endif
if(interrupted()) @@ -294,7 +294,7 @@ IceInternal::Transceiver::read(Buffer& buf, int timeout) if(wouldBlock()) { -#ifdef _WIN32_WCE +#ifdef _WIN32 // // This code is basically the same as the code in // ::send above. Check that for detailed comments. @@ -431,7 +431,7 @@ IceInternal::Transceiver::Transceiver(const InstancePtr& instance, SOCKET fd) : , _isPeerLocal(isPeerLocal(fd)) #endif { -#ifdef _WIN32_WCE +#ifdef _WIN32 _event = WSACreateEvent(); if(_event == 0) { @@ -466,7 +466,7 @@ IceInternal::Transceiver::Transceiver(const InstancePtr& instance, SOCKET fd) : IceInternal::Transceiver::~Transceiver() { assert(_fd == INVALID_SOCKET); -#ifdef _WIN32_WCE +#ifdef _WIN32 assert(_event == 0); #endif } |