diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-28 10:02:49 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-28 10:02:49 (GMT) |
| commit | f8188b14493eb3d01263be5fef4ea086d3a542a0 (patch) | |
| tree | b8b8a4f9af97bcdc135a974c6357090b3fa3f2fb /src/3rdparty/webkit/JavaScriptCore | |
| parent | fcb270e961b0edd2f2fa33954e20f9a284048e4a (diff) | |
| parent | 3e8592661f7607542c5a0df4c5f735716a0ec09d (diff) | |
| download | Qt-f8188b14493eb3d01263be5fef4ea086d3a542a0.zip Qt-f8188b14493eb3d01263be5fef4ea086d3a542a0.tar.gz Qt-f8188b14493eb3d01263be5fef4ea086d3a542a0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore')
| -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 |