summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Network.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-03-20 18:18:03 +0100
committerBenoit Foucher <benoit@zeroc.com>2015-03-20 18:18:03 +0100
commitc6133370d229578697c157f94b297dcc593b4a5f (patch)
tree9bbc2e3083338315393109a511e7a65d09dc9ac6 /cpp/src/Ice/Network.h
parentRemove src directory. (diff)
downloadice-c6133370d229578697c157f94b297dcc593b4a5f.tar.bz2
ice-c6133370d229578697c157f94b297dcc593b4a5f.tar.xz
ice-c6133370d229578697c157f94b297dcc593b4a5f.zip
Added iOS support for IceTouch
Diffstat (limited to 'cpp/src/Ice/Network.h')
-rw-r--r--cpp/src/Ice/Network.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index a731a49db3d..f90e3d6da61 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -45,8 +45,10 @@ typedef int ssize_t;
#if defined(__linux) && !defined(ICE_NO_EPOLL)
# define ICE_USE_EPOLL 1
-#elif (defined(__APPLE__) || defined(__FreeBSD__)) && !defined(ICE_NO_KQUEUE)
+#elif (defined(__APPLE__) || defined(__FreeBSD__)) && 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
#elif defined(_WIN32)
# if defined(ICE_OS_WINRT)
# elif !defined(ICE_NO_IOCP)
@@ -142,7 +144,11 @@ enum SocketOperation
// With BSD sockets, write and connect readiness are the same so
// we use the same value for both.
SocketOperationWrite = 2,
+#ifdef ICE_USE_CFSTREAM
+ SocketOperationConnect = 4
+#else
SocketOperationConnect = 2
+#endif
};
//