From 965f2893b85edafc38fb09ec065a3ef549c70135 Mon Sep 17 00:00:00 2001 From: Charlie Groves Date: Sun, 14 Nov 2010 00:30:43 +0000 Subject: [PATCH] Use the proper iOS detection define git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6267 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/cpp/presents/stable.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cpp/presents/stable.h b/src/cpp/presents/stable.h index f09456c06..bbaed24c4 100644 --- a/src/cpp/presents/stable.h +++ b/src/cpp/presents/stable.h @@ -51,6 +51,10 @@ typedef boost::signals::scoped_connection scoped_connection_t; # error The current compiler is not supported. #endif +#ifdef __APPLE__ +#include "TargetConditionals.h" +#endif + #if defined(_WIN32) # define PRESENTS_HOST_LITTLE_ENDIAN typedef signed __int8 int8; @@ -64,7 +68,7 @@ typedef unsigned __int64 uint64; typedef unsigned int uint; typedef unsigned long ulong; -#elif defined(__IPHONE__) +#elif defined(TARGET_OS_IPHONE) # define PRESENTS_IOS #include typedef int8_t int8; @@ -128,7 +132,7 @@ typedef unsigned long ulong; # error The current platform is not supported. #endif -#if defined(PRESENTS_IOS) || defined(PRESENTS_MACOSX) +#if defined(__APPLE__) // Apple defines __BIG_ENDIAN__ and __LITTLE_ENDIAN__ # if defined(__BIG_ENDIAN__) # define PRESENTS_HOST_BIG_ENDIAN