diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-02-07 19:25:51 +1100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 03:13:32 +0100 |
| commit | 029bad8b5a3aef6a9ad86bf18e83bdad8ce9ffd2 (patch) | |
| tree | 443bbcb43a4df648a195b1e0c10f25f33d5f67f9 /src/corelib/tools/qsimd.cpp | |
| parent | a313db2c81c904e9cdb7099d0ebd0a906b887637 (diff) | |
Fix compilation with MinGW-w64
Fix compilation with MinGW-w64 with the following changes:
- Include intrin.h to fix __cpuid not declared error
- Include intrin.h before *mmintrin.h headers to avoid extern linkable
mismatch
- Use quintptr instead of unsigned long to handle LLP64
- Do not declare winuser.h structs already provided with MinGW-w64
- Work around IID_IShellItem being declared but not defined with
MinGW-w64
- Remove incorrect use of SUCCEEDED macro on pointer
Change-Id: Ia21f8e3a1d225cf501e646eacd968bfc744ce0a2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/corelib/tools/qsimd.cpp')
| -rw-r--r-- | src/corelib/tools/qsimd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index d65dfa35a6..b3d2d62819 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -47,7 +47,7 @@ # if defined(Q_OS_WINCE) # include <qt_windows.h> # endif -# if defined(Q_OS_WIN64) && !defined(Q_CC_GNU) +# if defined(Q_OS_WIN64) # include <intrin.h> # endif #elif defined(Q_OS_LINUX) && defined(__arm__) |