diff options
| author | Jose <jose@zeroc.com> | 2014-09-11 17:38:07 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-11 17:38:07 +0200 |
| commit | c23959aa7a6bb1f81f1834fd68aed48962fd6e2e (patch) | |
| tree | a1d14ec52574508a3e9e3492462c3a845e0912e7 /cpp/src/Ice/Network.cpp | |
| parent | Fix dependencies causing C++ rebuilds (diff) | |
| download | ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.bz2 ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.xz ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.zip | |
Revert "Fixed (ICE-3792) - dependencies in the repository are very crappy"
This reverts commit 201d395c7186e50d195672db7b472989783826cb.
Conflicts:
cpp/config/Make.rules
cpp/test/Ice/Makefile.mak
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 0157fdd7809..0ad8aa6cefa 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -51,12 +51,6 @@ # 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 @@ -64,6 +58,9 @@ # 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" { @@ -167,7 +164,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) { |