diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-03 09:43:33 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-03 10:03:39 (GMT) |
| commit | 1bf7506ca27ff797d4e4deac567ac515a87eb324 (patch) | |
| tree | 110515a2e810b2fa5d6cdfd3b833fb9c6ba13f8d | |
| parent | 25014061b8de7345f4480eb0eb20221ef2e34710 (diff) | |
| download | Qt-1bf7506ca27ff797d4e4deac567ac515a87eb324.zip Qt-1bf7506ca27ff797d4e4deac567ac515a87eb324.tar.gz Qt-1bf7506ca27ff797d4e4deac567ac515a87eb324.tar.bz2 | |
qfsfileengine_win.cpp MinGW compile fix
On MinGW REPARSE_DATA_BUFFER_HEADER_SIZE is defined but no
IO_REPARSE_TAG_SYMLINK. So this define must be checked separately.
Reviewed-by: phartman
| -rw-r--r-- | src/corelib/io/qfsfileengine_win.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 5ff0716..a5ed95c 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -89,7 +89,8 @@ typedef INT_PTR intptr_t; # define INVALID_FILE_ATTRIBUTES (DWORD (-1)) #endif -#if !defined(REPARSE_DATA_BUFFER_HEADER_SIZE) && !defined(Q_OS_WINCE) +#if !defined(Q_OS_WINCE) +# if !defined(REPARSE_DATA_BUFFER_HEADER_SIZE) typedef struct _REPARSE_DATA_BUFFER { ULONG ReparseTag; USHORT ReparseDataLength; @@ -115,8 +116,9 @@ typedef struct _REPARSE_DATA_BUFFER { } GenericReparseBuffer; }; } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; +# define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer) +# endif // !defined(REPARSE_DATA_BUFFER_HEADER_SIZE) -# define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer) # ifndef MAXIMUM_REPARSE_DATA_BUFFER_SIZE # define MAXIMUM_REPARSE_DATA_BUFFER_SIZE 16384 # endif @@ -126,7 +128,7 @@ typedef struct _REPARSE_DATA_BUFFER { # ifndef FSCTL_GET_REPARSE_POINT # define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) # endif -#endif +#endif // !defined(Q_OS_WINCE) QT_BEGIN_NAMESPACE |