From 7fb1434479001890b073405d53c7814143e9929a Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Tue, 23 Feb 2010 22:04:09 +0100 Subject: Build fixes for the SIMD functions Two semicolons were missing for arm. The MMX header was included for all non-x86 platforms. --- src/corelib/tools/qsimd.cpp | 4 ++-- 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 #elif defined(Q_OS_WINCE_STD) && defined(_X86_) # pragma warning(disable: 4391) # include #endif +#endif // 3D now intrinsics #if defined(QT_HAVE_3DNOW) -- cgit v0.12