whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix X86 Wince builds. 

Windows CE does not have all _BitScanReverse
intrinsics, so disable those for Q_OS_WINCE.

Change-Id: I34a3c02c6ffdfff2a209b2c9c1b80bef4566ee39
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
bb10
Bjoern Breitmeyer 2014-09-04 11:25:20 +02:00 committed by Björn Breitmeyer
parent a0bdbc1442
commit 7ebc151bcf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdparty/pcre/sljit/sljitNativeX86_common.c vendored
View File

@ -276,7 +276,9 @@ static sljit_si cpu_has_sse2 = -1;
#endif
static sljit_si cpu_has_cmov = -1;
#if defined(_MSC_VER) && _MSC_VER >= 1400
#ifdef _WIN32_WCE
#include <cmnintrin.h>
#elif defined(_MSC_VER) && _MSC_VER >= 1400
#include <intrin.h>
#endif

2
src/corelib/tools/qsimd_p.h
View File

@ -318,7 +318,7 @@ static inline uint qCpuFeatures()
#ifdef Q_PROCESSOR_X86
// Bit scan functions for x86
# ifdef Q_CC_MSVC
# if defined(Q_CC_MSVC) && !defined(Q_OS_WINCE)
// MSVC calls it _BitScanReverse and returns the carry flag, which we don't need
static __forceinline unsigned long _bit_scan_reverse(uint val)
{