diff options
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/Network.h | 2 | ||||
| -rw-r--r-- | scripts/icehashpassword.py | 2 |
3 files changed, 3 insertions, 3 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 diff --git a/scripts/icehashpassword.py b/scripts/icehashpassword.py index 9b2827ab461..35a09c12b5a 100644 --- a/scripts/icehashpassword.py +++ b/scripts/icehashpassword.py @@ -11,7 +11,7 @@ import sys, getopt, passlib.hash, getpass usePBKDF2 = any(sys.platform == p for p in ["win32", "darwin"]) -useCryptExt = any(sys.platform.startswith(p) for p in ["linux", "freebsd"]) +useCryptExt = any(sys.platform.startswith(p) for p in ["linux", "freebsd", "gnukfreebsd"]) if not usePBKDF2 and not useCryptExt: |