diff options
| author | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
| commit | 99855eefd7419c24e9b204fb851ec95adc581b4e (patch) | |
| tree | 0d79a68449d770c3c550b43121c0d6d43f602d14 /cpp/src/Ice/Network.h | |
| parent | Allow java libraries to override pom scm data (diff) | |
| parent | Stack trace test expec files for Linux (diff) | |
| download | ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.bz2 ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.xz ice-99855eefd7419c24e9b204fb851ec95adc581b4e.zip | |
Merge branch '3.6-stretch' into 3.6
Diffstat (limited to 'cpp/src/Ice/Network.h')
| -rw-r--r-- | cpp/src/Ice/Network.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |