diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-04-15 16:05:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-17 13:46:17 +0200 |
| commit | a19ed97f4c805ac6523497a13c81ab591a6f2522 (patch) | |
| tree | 3e21a54d9cbff3d29f001faa03f25519b2c40677 /src/3rdparty | |
| parent | b7276f2362f1b3b1682a36f1b6dad81a16c8c36a (diff) | |
Fix build on iOS
Add missing include for sys_cache_control, and make sure we don't
define PLATFORM(IOS) or PLATFORM(IOS_SIMULATOR), since we're
PLATFORM(QT).
Intentionally squashed both changes for easier rebasing against
upstream.
Change-Id: I2e010aec76d1f1863d177af8a70091cc88bbc999
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/assembler/ARMv7Assembler.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/Platform.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/ARMv7Assembler.h b/src/3rdparty/masm/assembler/ARMv7Assembler.h index 7dcf656921..99a0e82b1a 100644 --- a/src/3rdparty/masm/assembler/ARMv7Assembler.h +++ b/src/3rdparty/masm/assembler/ARMv7Assembler.h @@ -34,6 +34,10 @@ #include <wtf/Vector.h> #include <stdint.h> +#if OS(IOS) +#include <libkern/OSCacheControl.h> +#endif + namespace JSC { namespace ARMRegisters { diff --git a/src/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h index 5c85c15634..64ffbb71f7 100644 --- a/src/3rdparty/masm/wtf/Platform.h +++ b/src/3rdparty/masm/wtf/Platform.h @@ -448,7 +448,7 @@ #define WTF_PLATFORM_MAC 1 #elif OS(WINDOWS) #define WTF_PLATFORM_WIN 1 -#endif +#else /* PLATFORM(IOS) */ /* FIXME: this is sometimes used as an OS switch and sometimes for higher-level things */ @@ -461,6 +461,7 @@ #define WTF_PLATFORM_IOS 1 #define WTF_PLATFORM_IOS_SIMULATOR 1 #endif +#endif /* Graphics engines */ |