diff options
| author | Jose <jose@zeroc.com> | 2014-09-10 17:36:20 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-10 17:36:20 +0200 |
| commit | 00dbbdfaeae1af7d7457329641bb0cf6e726ba3c (patch) | |
| tree | a658e21567cf3227ad52d948627fae5db1946140 /cpp/src/Ice/Network.cpp | |
| parent | ICE-5582 (SOCKs test), ICE-5314 (HTTP proxies), major refactoring of networki... (diff) | |
| download | ice-00dbbdfaeae1af7d7457329641bb0cf6e726ba3c.tar.bz2 ice-00dbbdfaeae1af7d7457329641bb0cf6e726ba3c.tar.xz ice-00dbbdfaeae1af7d7457329641bb0cf6e726ba3c.zip | |
Fixed (ICE-3792) - dependencies in the repository are very crappy
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 0ad8aa6cefa..0157fdd7809 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -51,6 +51,12 @@ # include <sys/sockio.h> #endif +#if defined(_WIN32) +# ifndef SIO_LOOPBACK_FAST_PATH +# define SIO_LOOPBACK_FAST_PATH _WSAIOW(IOC_VENDOR,16) +# endif +#endif + #if defined(__MINGW32__) // // Work-around for missing definitions in MinGW Windows headers @@ -58,9 +64,6 @@ # ifndef IPV6_V6ONLY # define IPV6_V6ONLY 27 # endif -# ifndef SIO_LOOPBACK_FAST_PATH -# define SIO_LOOPBACK_FAST_PATH _WSAIOW(IOC_VENDOR,16) -# endif extern "C" { @@ -164,7 +167,7 @@ setTcpLoopbackFastPath(SOCKET fd) WSAIoctl(fd, SIO_LOOPBACK_FAST_PATH, &OptionValue, sizeof(OptionValue), NULL, 0, &NumberOfBytesReturned, 0, 0); if(status == SOCKET_ERROR) { - // On platforms that do not support fast path (< Windows 8), WSAEONOTSUPP is expected. + // On platforms that do not support fast path (< Windows 8), WSAEONOTSUPP is expected. DWORD LastError = ::GetLastError(); if(LastError != WSAEOPNOTSUPP) { |