summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ThreadPool.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2007-02-01 21:03:17 +0000
committerBenoit Foucher <benoit@zeroc.com>2007-02-01 21:03:17 +0000
commit0e657ed67fb888b5eb50376c7a7b33bed1afe815 (patch)
treeb20ff8cf00048522067ec0e51fc52309457b88a3 /cpp/src/Ice/ThreadPool.h
parentJava6 support (diff)
downloadice-0e657ed67fb888b5eb50376c7a7b33bed1afe815.tar.bz2
ice-0e657ed67fb888b5eb50376c7a7b33bed1afe815.tar.xz
ice-0e657ed67fb888b5eb50376c7a7b33bed1afe815.zip
Fixed bug 1710
Diffstat (limited to 'cpp/src/Ice/ThreadPool.h')
-rw-r--r--cpp/src/Ice/ThreadPool.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 6cda824ee5e..63ed1190dd2 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -22,12 +22,14 @@
#include <Ice/EventHandlerF.h>
#include <list>
-#ifdef _WIN32
+#if defined(_WIN32)
# include <winsock2.h>
#else
# define SOCKET int
-# ifdef __linux
+# if defined(__linux)
# include <sys/epoll.h>
+# elif defined(__APPLE__)
+# include <sys/event.h>
# else
# include <sys/poll.h>
# endif
@@ -81,6 +83,9 @@ private:
#elif defined(__linux)
int _epollFd;
std::vector<struct epoll_event> _events;
+#elif defined(__APPLE__)
+ int _kqueueFd;
+ std::vector<struct kevent> _events;
#else
std::vector<struct pollfd> _pollFdSet;
#endif