summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Network.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-06-10 20:27:27 +0200
committerJose <jose@zeroc.com>2016-06-10 20:27:27 +0200
commit4b05414a06671350f6b5eb8039beaa4b988d0b5a (patch)
tree9670f9b32859892641d5c5f75f4b91c266c15868 /cpp/src/Ice/Network.cpp
parentFixes to support kFreeBSD (diff)
downloadice-4b05414a06671350f6b5eb8039beaa4b988d0b5a.tar.bz2
ice-4b05414a06671350f6b5eb8039beaa4b988d0b5a.tar.xz
ice-4b05414a06671350f6b5eb8039beaa4b988d0b5a.zip
Debian kFreeBSD fixes
- ICE_USE_KQUEUE was not being defined for kFreeBSD - closeSocket needs to deal with ECONNRESET in same way that FreeBSD does - icehashpassword.py was unable to detec kFreeBSD platform
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
-rw-r--r--cpp/src/Ice/Network.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 74188d50f42..84237fbc852 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -1239,7 +1239,7 @@ IceInternal::closeSocket(SOCKET fd)
#else
int error = errno;
-# if defined(__FreeBSD__)
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
//
// FreeBSD returns ECONNRESET if the underlying object was
// a stream socket that was shut down by the peer before all