diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-01 10:19:07 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 11:06:19 +0100 |
commit | b44e67e1ca5766daef3e4f7a6dd433ebe0f744d1 (patch) | |
tree | fd10ab1e36f4b0c2c6b8d2061ae3dc71c508ba7b /src/corelib/tools/qsimd.cpp | |
parent | 9fa4e51dbb8cac4f7f5a6bee6e1b9b029b57f393 (diff) |
Windows: Fix inclusion of <windows.h>
- Always use <qt_windows.h> as the last file to be included.
- Remove it from some headers, use Qt::HANDLE instead of HANDLE.
- Clean up #ifdef, use Q_OS_WIN for Windows/Windows CE.
- Add NOMINMAX to qt_windows.h to avoid problems with the
min/max macros.
- Remove <windows.h> from qplatformdefs.h (VS2005)
Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/corelib/tools/qsimd.cpp')
-rw-r--r-- | src/corelib/tools/qsimd.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index b1a321320d..d65dfa35a6 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -43,15 +43,14 @@ #include <QByteArray> #include <stdio.h> -#if defined(Q_OS_WINCE) -#include <windows.h> -#endif - -#if defined(Q_OS_WIN64) && !defined(Q_CC_GNU) -#include <intrin.h> -#endif - -#if defined(Q_OS_LINUX) && defined(__arm__) +#if defined(Q_OS_WIN) +# if defined(Q_OS_WINCE) +# include <qt_windows.h> +# endif +# if defined(Q_OS_WIN64) && !defined(Q_CC_GNU) +# include <intrin.h> +# endif +#elif defined(Q_OS_LINUX) && defined(__arm__) #include "private/qcore_unix_p.h" // the kernel header definitions for HWCAP_* |