Changeset 69866 in vbox

Timestamp:

Nov 28, 2017 7:10:50 PM (7 years ago)

Author:

vboxsync

Message:

iprt/formats/ntfs: build fixes - g++ sometimes hates unnamed unions, sigh.

Location:

trunk

Files:

• include/iprt/formats/ntfs.h (modified) (2 diffs)
• src/VBox/Runtime/common/fs/ntfsvfs.cpp (modified) (1 diff)

trunk/include/iprt/formats/ntfs.h

@@ -411 +411 @@
         /** 0x3c: Reparse tag, if no EAs. */
         uint32_t        uReparseTag;
-    };
+    } u;
     /** 0x40: Filename length in unicode chars. */
     uint8_t             cwcFilename;
@@ -420 +420 @@
 } NTFSATFILENAME;
 AssertCompileMemberOffset(NTFSATFILENAME, cbData, 0x30);
-AssertCompileMemberOffset(NTFSATFILENAME, cbPackedEas, 0x3c);
-AssertCompileMemberOffset(NTFSATFILENAME, uReparseTag, 0x3c);
+AssertCompileMemberOffset(NTFSATFILENAME, u.cbPackedEas, 0x3c);
+AssertCompileMemberOffset(NTFSATFILENAME, u.uReparseTag, 0x3c);
 AssertCompileMemberOffset(NTFSATFILENAME, wszFilename, 0x42);
 /** Pointer to a NTFS filename attribute. */

trunk/src/VBox/Runtime/common/fs/ntfsvfs.cpp

@@ -339 +339 @@
                                     Log2(("NTFS:     fFileAttribs       %#RX32\n", RT_LE2H_U32(pInfo->fFileAttribs) ));
                                     if (RT_LE2H_U32(pInfo->fFileAttribs) & NTFS_FA_REPARSE_POINT)
-                                        Log2(("NTFS:     uReparseTag        %#RX32\n", RT_LE2H_U32(pInfo->uReparseTag) ));
+                                        Log2(("NTFS:     uReparseTag        %#RX32\n", RT_LE2H_U32(pInfo->u.uReparseTag) ));
                                     else
-                                        Log2(("NTFS:     cbPackedEas        %#RX16\n", RT_LE2H_U16(pInfo->cbPackedEas) ));
+                                        Log2(("NTFS:     cbPackedEas        %#RX16\n", RT_LE2H_U16(pInfo->u.cbPackedEas) ));
                                     Log2(("NTFS:     cwcFilename        %#x\n", pInfo->cwcFilename));
                                     Log2(("NTFS:     fFilenameType      %#x\n", pInfo->fFilenameType));