diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-09-09 12:14:11 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-09-09 12:14:11 +0200 |
| commit | 3111c7f31632021af56e026cb434e9f8ced7388a (patch) | |
| tree | 3f82b3f51d36920a70c79e15f062025e7c357d7e /cpp/src | |
| parent | VC60 fixes (diff) | |
| download | ice-3111c7f31632021af56e026cb434e9f8ced7388a.tar.bz2 ice-3111c7f31632021af56e026cb434e9f8ced7388a.tar.xz ice-3111c7f31632021af56e026cb434e9f8ced7388a.zip | |
IOCP VC6 fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/TcpAcceptor.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/AcceptorI.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 56139b5aafb..406ef97609d 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -588,7 +588,7 @@ IceInternal::connectInProgress() { #ifdef _WIN32 int error = WSAGetLastError(); - return error == WSAEWOULDBLOCK || error == WSA_IO_PENDING; + return error == WSAEWOULDBLOCK || error == WSA_IO_PENDING || error == ERROR_IO_PENDING; #else return errno == EINPROGRESS; #endif diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp index 9a960d7fc35..453d0cbccc1 100644 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -124,7 +124,7 @@ IceInternal::TcpAcceptor::startAccept() #endif )) { - if(WSAGetLastError() != WSA_IO_PENDING) + if(!wouldBlock()) { SocketException ex(__FILE__, __LINE__); ex.error = getSocketErrno(); diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index cb40592c5df..005ce765e74 100644 --- a/cpp/src/IceSSL/AcceptorI.cpp +++ b/cpp/src/IceSSL/AcceptorI.cpp @@ -130,7 +130,7 @@ IceSSL::AcceptorI::startAccept() #endif )) { - if(WSAGetLastError() != WSA_IO_PENDING) + if(!IceInternal::wouldBlock()) { SocketException ex(__FILE__, __LINE__); ex.error = IceInternal::getSocketErrno(); |