diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-09-02 12:58:35 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-09-02 12:58:35 -0230 |
| commit | 7b3198c81431c2491afa128f78f4b314eeaa358b (patch) | |
| tree | 9f2d72fa96501340566fe29a336b356b497da693 /cpp/src/Ice/Network.cpp | |
| parent | 4238 - Java test suite and ant options. (diff) | |
| download | ice-7b3198c81431c2491afa128f78f4b314eeaa358b.tar.bz2 ice-7b3198c81431c2491afa128f78f4b314eeaa358b.tar.xz ice-7b3198c81431c2491afa128f78f4b314eeaa358b.zip | |
Added Advanced Installer third party installer projects for VC6 and VC9
Fixed some VC6 compile errors
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 85bd7c8a997..56139b5aafb 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -543,7 +543,7 @@ IceInternal::wouldBlock() { #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 == EAGAIN || errno == EWOULDBLOCK; #endif @@ -1305,7 +1305,13 @@ IceInternal::doConnectAsync(SOCKET fd, const struct sockaddr_storage& addr, Asyn throw ex; } - if(!ConnectEx(fd, reinterpret_cast<const struct sockaddr*>(&addr), size, 0, 0, 0, &info)) + if(!ConnectEx(fd, reinterpret_cast<const struct sockaddr*>(&addr), size, 0, 0, 0, +#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60 + reinterpret_cast<LPOVERLAPPED>(&info) +#else + &info +#endif + )) { if(!connectInProgress()) { |