summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qtwindows_additional.h
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2012-02-07 19:25:51 +1100
committerQt by Nokia <qt-info@nokia.com>2012-02-08 03:13:32 +0100
commit029bad8b5a3aef6a9ad86bf18e83bdad8ce9ffd2 (patch)
tree443bbcb43a4df648a195b1e0c10f25f33d5f67f9 /src/plugins/platforms/windows/qtwindows_additional.h
parenta313db2c81c904e9cdb7099d0ebd0a906b887637 (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/plugins/platforms/windows/qtwindows_additional.h')
-rw-r--r--src/plugins/platforms/windows/qtwindows_additional.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qtwindows_additional.h b/src/plugins/platforms/windows/qtwindows_additional.h
index 864107e392..a85a798b9e 100644
--- a/src/plugins/platforms/windows/qtwindows_additional.h
+++ b/src/plugins/platforms/windows/qtwindows_additional.h
@@ -66,6 +66,8 @@
#define IFACEMETHODIMP STDMETHODIMP
#define IFACEMETHODIMP_(type) STDMETHODIMP_(type)
+#if !defined(__MINGW64_VERSION_MAJOR)
+
typedef struct tagUPDATELAYEREDWINDOWINFO {
DWORD cbSize;
HDC hdcDst;
@@ -79,6 +81,8 @@ typedef struct tagUPDATELAYEREDWINDOWINFO {
const RECT *prcDirty;
} UPDATELAYEREDWINDOWINFO, *PUPDATELAYEREDWINDOWINFO;
+#endif // if !defined(__MINGW64_VERSION_MAJOR)
+
// OpenGL Pixelformat flags.
#define PFD_SUPPORT_DIRECTDRAW 0x00002000
#define PFD_DIRECT3D_ACCELERATED 0x00004000