Fixed QSimd WindowsCE build
authorBjoern Breitmeyer <bjoern.breitmeyer@kdab.com>
Thu, 19 Apr 2012 13:37:24 +0000 (15:37 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 19 Apr 2012 14:27:22 +0000 (16:27 +0200)
Change-Id: I94de251cf1f283d30f92d0fb9d37a1646765cbdd
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
src/corelib/tools/qsimd.cpp

index fb62192..cd480f0 100644 (file)
 #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