From db98bd316d4cf04c48122a56243d9f7131dcec46 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 10 Dec 2018 14:53:09 -0600 Subject: [PATCH] shobjidl: Fix compile guard around SHARDAPPIDINFOLINK Change-Id: I0009fe43706b0e9d95cf505a71c9ac96b9e9f216 --- src/winextras/winshobjidl_p.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/qtwinextras/src/winextras/winshobjidl_p.h b/qtwinextras/src/winextras/winshobjidl_p.h index efd28c6..fba38a8 100644 --- a/qtwinextras/src/winextras/winshobjidl_p.h +++ b/qtwinextras/src/winextras/winshobjidl_p.h @@ -229,9 +229,7 @@ public: #endif -#ifdef Q_CC_MINGW - -# if !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW64_VERSION_MINOR) || __MINGW64_VERSION_MAJOR * 100 + __MINGW64_VERSION_MINOR < 301 +#if (NTDDI_VERSION < NTDDI_WIN7) typedef struct SHARDAPPIDINFOLINK { @@ -241,8 +239,6 @@ typedef struct SHARDAPPIDINFOLINK PCWSTR pszAppID; // The id of the application that should be associated with this recent doc. } SHARDAPPIDINFOLINK; -# endif // !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW64_VERSION_MINOR) || __MINGW64_VERSION_MAJOR * 100 + __MINGW64_VERSION_MINOR < 301 - #endif #endif // WINSHOBJIDL_P_H -- 2.19.1