diff options
| author | Bjoern Breitmeyer <bjoern.breitmeyer@kdab.com> | 2012-04-19 15:37:24 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 16:27:22 +0200 |
| commit | 14ea50598fb7217de5336ba33302a0ed151327a2 (patch) | |
| tree | 2dd04764dc68d5821985bff714bfd15166758226 | |
| parent | 2b130d0cf69fa6d7790d68d0689096c10dc5e6a5 (diff) | |
Fixed QSimd WindowsCE build
Change-Id: I94de251cf1f283d30f92d0fb9d37a1646765cbdd
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | src/corelib/tools/qsimd.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index fb6219273f..cd480f0521 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -46,9 +46,12 @@ #if defined(Q_OS_WIN) # if defined(Q_OS_WINCE) # include <qt_windows.h> +# include <cmnintrin.h> # endif # if !defined(Q_CC_GNU) -# include <intrin.h> +# ifndef Q_OS_WINCE +# include <intrin.h> +# endif # endif #elif defined(Q_OS_LINUX) && defined(__arm__) #include "private/qcore_unix_p.h" @@ -384,8 +387,12 @@ static const uint minFeature = None #else int ffs(int i) { +#ifndef Q_OS_WINCE unsigned long result; return _BitScanForward(&result, i) ? result : 0; +#else + return 0; +#endif } #endif #endif // Q_OS_WIN |