diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-29 06:49:11 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-29 06:49:11 (GMT) |
| commit | ff6c8f9439630c2ea3bf78d5568a44521e915898 (patch) | |
| tree | ff3fc149ebc6547dda412500aadeacbe568e2ceb /src/3rdparty/webkit/JavaScriptCore/wtf | |
| parent | 6034fc5b4a15bab2ab65e4cc3963fe00bdcb415b (diff) | |
| parent | fd5269a9a80bf8b119086b3f326c72a332aba4e9 (diff) | |
| download | Qt-ff6c8f9439630c2ea3bf78d5568a44521e915898.zip Qt-ff6c8f9439630c2ea3bf78d5568a44521e915898.tar.gz Qt-ff6c8f9439630c2ea3bf78d5568a44521e915898.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/wtf')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h index e508f77..bd82d8f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -238,7 +238,8 @@ #define WTF_PLATFORM_MIDDLE_ENDIAN 1 #endif #define ARM_ARCH_VERSION 3 -#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) +#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || defined(ARMV4I) \ + || defined(_ARMV4I_) || defined(armv4i) #undef ARM_ARCH_VERSION #define ARM_ARCH_VERSION 4 #endif |