summaryrefslogtreecommitdiff
path: root/cppe/src
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-09-02 16:59:06 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-09-02 16:59:06 +0000
commit6194c6d3f314813e05112c17a2c8bedeb47827e6 (patch)
tree50ee487e0430265ff6e7ef2aaedfa6302a5195fb /cppe/src
parentfixes for bug 422 (diff)
downloadice-6194c6d3f314813e05112c17a2c8bedeb47827e6.tar.bz2
ice-6194c6d3f314813e05112c17a2c8bedeb47827e6.tar.xz
ice-6194c6d3f314813e05112c17a2c8bedeb47827e6.zip
Bug 398: Remove temporary workaround for Windows.
Diffstat (limited to 'cppe/src')
-rw-r--r--cppe/src/IceE/Network.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/cppe/src/IceE/Network.cpp b/cppe/src/IceE/Network.cpp
index 68815363cc0..43623de1cdb 100644
--- a/cppe/src/IceE/Network.cpp
+++ b/cppe/src/IceE/Network.cpp
@@ -148,20 +148,6 @@ IceInternal::createSocket()
throw ex;
}
-#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) && !defined(_WIN32_WCE)
- //
- // Temporary work-around!
- // Make this socket non-inheritable, so that IcePack-launched servers
- // do not inherit it.
- //
- if(!SetHandleInformation(reinterpret_cast<HANDLE>(fd), HANDLE_FLAG_INHERIT, 0))
- {
- SyscallException ex(__FILE__, __LINE__);
- ex.error = getSystemErrno();
- throw ex;
- }
-#endif
-
setTcpNoDelay(fd);
setKeepAlive(fd);