3rdparty/ext_qt/QTBUG-94031-Fix-compile-with-MinGW-W64-9.0.0-Redefinition-of-str.patch

0001 From b0832615847fa4c8095e1b60e0f68cd2224e765d Mon Sep 17 00:00:00 2001
0002 From: Jonas Kvinge <jonas@jkvinge.net>
0003 Date: Mon, 16 Aug 2021 22:01:39 +0200
0004 Subject: [PATCH] Fix compile with MinGW-W64 9.0.0: Redefinition of 'struct
0005  _FILE_ID_INFO'
0006
0007 With MinGW-W64 9.0.0, _WIN32_WINNT is set to Windows 10 by default, so
0008 _FILE_ID_INFO is already defined.
0009
0010 Fixes: QTBUG-94031
0011 Pick-to: 6.2
0012 Change-Id: I0b29a4a1932425e1c4079aba6768fe94460c60af
0013 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
0014 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
0015 (cherry picked from commit 4ddbfb68f858aee45cf7c33718f16b6c7b5beed7)
0016 ---
0017  src/corelib/io/qfilesystemengine_win.cpp | 4 ++--
0018  1 file changed, 2 insertions(+), 2 deletions(-)
0019
0020 diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
0021 index 279918b812..165965309c 100644
0022 --- a/src/corelib/io/qfilesystemengine_win.cpp
0023 +++ b/src/corelib/io/qfilesystemengine_win.cpp
0024 @@ -555,14 +555,14 @@ QFileSystemEntry QFileSystemEngine::absoluteName(const QFileSystemEntry &entry)
0025      return QFileSystemEntry(ret, QFileSystemEntry::FromInternalPath());
0026  }
0027
0028 -#if defined(Q_CC_MINGW) && WINVER < 0x0602 //  Windows 8 onwards
0029 +#if defined(Q_CC_MINGW) && WINVER < 0x0602 && _WIN32_WINNT < _WIN32_WINNT_WIN8 //  Windows 8 onwards
0030
0031  typedef struct _FILE_ID_INFO {
0032      ULONGLONG VolumeSerialNumber;
0033      FILE_ID_128 FileId;
0034  } FILE_ID_INFO, *PFILE_ID_INFO;
0035
0036 -#endif // if defined (Q_CC_MINGW) && WINVER < 0x0602
0037 +#endif // if defined(Q_CC_MINGW) && WINVER < 0x0602 && _WIN32_WINNT < _WIN32_WINNT_WIN8
0038
0039  // File ID for Windows up to version 7 and FAT32 drives
0040  static inline QByteArray fileId(HANDLE handle)
0041 --
0042 2.24.1.windows.2
0043