AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Fix compilation with MinGW-64, gcc 4.8.1

Browse Source 
A definition for FILE_ID_128 was added.

Change-Id: Ifdfe5da1b15a90afdf5cf09d92838a04b1cf5c19
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Friedemann Kleint 2013-08-26 11:52:47 +02:00 committed by The Qt Project
parent 4ffa60e03a
commit e59a5f9fdc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/io/qfilesystemengine_win.cpp
View File

@ -573,9 +573,12 @@ typedef enum { Q_FileIdInfo = 18 } Q_FILE_INFO_BY_HANDLE_CLASS;
# if defined(Q_CC_MINGW) || (defined(Q_CC_MSVC) && _MSC_VER < 1700) # if defined(Q_CC_MINGW) || (defined(Q_CC_MSVC) && _MSC_VER < 1700)
// MinGW-64 defines FILE_ID_128 as of gcc-4.8.1 along with FILE_SUPPORTS_INTEGRITY_STREAMS
# if !(defined(Q_CC_MINGW) && defined(FILE_SUPPORTS_INTEGRITY_STREAMS))
typedef struct _FILE_ID_128 { typedef struct _FILE_ID_128 {
BYTE Identifier[16]; BYTE Identifier[16];
} FILE_ID_128, *PFILE_ID_128; } FILE_ID_128, *PFILE_ID_128;
# endif // !(Q_CC_MINGW && FILE_SUPPORTS_INTEGRITY_STREAMS)
typedef struct _FILE_ID_INFO { typedef struct _FILE_ID_INFO {
ULONGLONG VolumeSerialNumber; ULONGLONG VolumeSerialNumber;
@ -614,7 +617,8 @@ QByteArray fileIdWin8(HANDLE handle)
&infoEx, sizeof(FILE_ID_INFO))) { &infoEx, sizeof(FILE_ID_INFO))) {
result = QByteArray::number(infoEx.VolumeSerialNumber, 16); result = QByteArray::number(infoEx.VolumeSerialNumber, 16);
result += ':'; result += ':';
result += QByteArray((char *)infoEx.FileId.Identifier, sizeof(infoEx.FileId.Identifier)).toHex(); // Note: MinGW-64's definition of FILE_ID_128 differs from the MSVC one.
result += QByteArray((char *)&infoEx.FileId, sizeof(infoEx.FileId)).toHex();
} }
} }
return result; return result;