diff options
| author | Jose <jose@zeroc.com> | 2016-06-10 20:27:27 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-10 20:27:27 +0200 |
| commit | 4b05414a06671350f6b5eb8039beaa4b988d0b5a (patch) | |
| tree | 9670f9b32859892641d5c5f75f4b91c266c15868 /cpp/src/Ice | |
| parent | Fixes to support kFreeBSD (diff) | |
| download | ice-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')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/Network.h | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h index 458261512f7..ea7ebd61f19 100644 --- a/cpp/src/Ice/Network.h +++ b/cpp/src/Ice/Network.h @@ -45,7 +45,7 @@ typedef int ssize_t; #if defined(__linux) && !defined(ICE_NO_EPOLL) # define ICE_USE_EPOLL 1 -#elif (defined(__APPLE__) || defined(__FreeBSD__)) && TARGET_OS_IPHONE == 0 && !defined(ICE_NO_KQUEUE) +#elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && TARGET_OS_IPHONE == 0 && !defined(ICE_NO_KQUEUE) # define ICE_USE_KQUEUE 1 #elif defined(__APPLE__) && !defined(ICE_NO_CFSTREAM) # define ICE_USE_CFSTREAM 1 |