diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-03-20 18:18:03 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-03-20 18:18:03 +0100 |
| commit | c6133370d229578697c157f94b297dcc593b4a5f (patch) | |
| tree | 9bbc2e3083338315393109a511e7a65d09dc9ac6 /cpp/include | |
| parent | Remove src directory. (diff) | |
| download | ice-c6133370d229578697c157f94b297dcc593b4a5f.tar.bz2 ice-c6133370d229578697c157f94b297dcc593b4a5f.tar.xz ice-c6133370d229578697c157f94b297dcc593b4a5f.zip | |
Added iOS support for IceTouch
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Glacier2/Glacier2.h | 2 | ||||
| -rw-r--r-- | cpp/include/Ice/Ice.h | 4 | ||||
| -rw-r--r-- | cpp/include/IceSSL/IceSSL.h | 2 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 6 | ||||
| -rw-r--r-- | cpp/include/IceUtil/IceUtil.h | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h index 958dd83ae1b..4cb1f6287bc 100644 --- a/cpp/include/Glacier2/Glacier2.h +++ b/cpp/include/Glacier2/Glacier2.h @@ -16,7 +16,7 @@ #include <Glacier2/Session.h> #include <Glacier2/PermissionsVerifier.h> #include <Glacier2/Metrics.h> -#ifndef ICE_OS_WINRT +#if (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) && !defined(ICE_OS_WINRT) # include <Glacier2/Application.h> #endif #include <Glacier2/SessionHelper.h> diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index a0e897e50e2..fe62daf80c8 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -31,7 +31,7 @@ #include <Ice/OutgoingAsync.h> #include <Ice/IncomingAsync.h> #include <Ice/Process.h> -#ifndef ICE_OS_WINRT +#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) # include <Ice/Application.h> #endif #include <Ice/Connection.h> @@ -46,7 +46,7 @@ #include <Ice/NativePropertiesAdmin.h> #include <Ice/Instrumentation.h> #include <Ice/Metrics.h> -#ifndef ICE_OS_WINRT +#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) # include <Ice/Service.h> #endif #include <IceUtil/PopDisableWarnings.h> diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h index 07efc48f331..46e65163807 100644 --- a/cpp/include/IceSSL/IceSSL.h +++ b/cpp/include/IceSSL/IceSSL.h @@ -12,7 +12,7 @@ #include <IceUtil/PushDisableWarnings.h> #include <IceUtil/Config.h> -#ifndef ICE_OS_WINRT +#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) # include <IceSSL/Plugin.h> #endif #include <IceSSL/EndpointInfo.h> diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 011ffe874f3..b1403509b48 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -22,7 +22,7 @@ #if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || \ defined(_M_X64) || defined(_M_IA64) || defined(__alpha__) || \ - defined(__ARMEL__) || defined(_M_ARM_FP) || \ + defined(__ARMEL__) || defined(_M_ARM_FP) || defined(__arm64) || \ defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN)) # define ICE_LITTLE_ENDIAN #elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || \ @@ -170,6 +170,10 @@ # include <errno.h> #endif +#ifdef __APPLE__ +# include <TargetConditionals.h> +#endif + #if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT) # if !defined(ICE_STATIC_LIBS) && (!defined(_DLL) || !defined(_MT)) # error "Only multi-threaded DLL libraries can be used with Ice!" diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h index 2e8dae16be5..f0c91dc095a 100644 --- a/cpp/include/IceUtil/IceUtil.h +++ b/cpp/include/IceUtil/IceUtil.h @@ -21,7 +21,7 @@ #include <IceUtil/AbstractMutex.h> #include <IceUtil/Cache.h> #include <IceUtil/Cond.h> -#ifndef ICE_OS_WINRT +#if !defined(__APPLE__) && !defined(ICE_OS_WINRT) # include <IceUtil/CtrlCHandler.h> #endif #include <IceUtil/Exception.h> |