diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-02-23 21:04:09 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-02-23 21:04:09 (GMT) |
| commit | 7fb1434479001890b073405d53c7814143e9929a (patch) | |
| tree | f648b05a50271cf7db878bcad0f6347536563c73 /src/corelib | |
| parent | 615972e09981a0916422716b4f6572c6401789da (diff) | |
| download | Qt-7fb1434479001890b073405d53c7814143e9929a.zip Qt-7fb1434479001890b073405d53c7814143e9929a.tar.gz Qt-7fb1434479001890b073405d53c7814143e9929a.tar.bz2 | |
Build fixes for the SIMD functions
Two semicolons were missing for arm. The MMX header was included
for all non-x86 platforms.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qsimd.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qsimd_p.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index 4ba8901..52d2cea 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -73,11 +73,11 @@ uint qDetectCPUFeatures() #elif defined(QT_HAVE_IWMMXT) // runtime detection only available when running as a previlegied process static const bool doIWMMXT = !qgetenv("QT_NO_IWMMXT").toInt(); - features = doIWMMXT ? IWMMXT : 0 + features = doIWMMXT ? IWMMXT : 0; return features; #elif defined(QT_HAVE_NEON) static const bool doNEON = !qgetenv("QT_NO_NEON").toInt(); - features = doNEON ? NEON : 0 + features = doNEON ? NEON : 0; return features; #else features = 0; diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index d0a057e..07fae97 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -96,12 +96,14 @@ QT_MODULE(Core) #endif #endif +#if defined(QT_HAVE_IWMMXT) #if !defined(__IWMMXT__) && !defined(Q_OS_WINCE) # include <xmmintrin.h> #elif defined(Q_OS_WINCE_STD) && defined(_X86_) # pragma warning(disable: 4391) # include <xmmintrin.h> #endif +#endif // 3D now intrinsics #if defined(QT_HAVE_3DNOW) |