Changeset 84509 in vbox for trunk/include/iprt/formats

Timestamp:

May 25, 2020 3:09:24 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138238

Message:

iprt/cdefs.h,*: Introducing RT_FLEXIBLE_ARRAY_EXTENSION as a g++ hack that allows us to use RT_FLEXIBLE_ARRAY without the compiler going all pendantic on us. Only tested with 10.1.0. bugref:9746

Location:

trunk/include/iprt/formats

Files:

• iso9660.h (modified) (2 diffs)
• mach-o.h (modified) (1 diff)
• ntfs.h (modified) (2 diffs)
• pecoff.h (modified) (1 diff)
• udf.h (modified) (8 diffs)

trunk/include/iprt/formats/iso9660.h

@@ -239 +239 @@
     uint16_t            idParentRec;
     /** 0x08: Directory identifier (d-characters or d1-characters). */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     char                achDirId[RT_FLEXIBLE_ARRAY];
     /* There will be a zero padding byte following if the directory identifier length is odd. */
@@ -291 +292 @@
     ISO9660U16          cbAppUse;
     /** 0x0fa: Variable sized application use field. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     uint8_t             abAppUse[RT_FLEXIBLE_ARRAY];
     /* This is followed by escape sequences with length given by cbEscapeSequnces. */

trunk/include/iprt/formats/mach-o.h

@@ -632 +632 @@
     uint32_t            sdk;        /**< SDK version:        31..16=major, 15..8=minor, 7..0=patch */
     uint32_t            ntools;     /**< Number of build_tool_version entries following in aTools. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     build_tool_version_t aTools[RT_FLEXIBLE_ARRAY];
 } build_version_command_t;

trunk/include/iprt/formats/ntfs.h

@@ -381 +381 @@
     uint16_t            idAttrib;
     /** 0x1a: Maybe where the attribute name starts. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     RTUTF16             wszName[RT_FLEXIBLE_ARRAY];
 } NTFSATLISTENTRY;
@@ -499 +500 @@
     uint8_t             fFilenameType;
     /** 0x42: The filename. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     RTUTF16             wszFilename[RT_FLEXIBLE_ARRAY];
 } NTFSATFILENAME;

trunk/include/iprt/formats/pecoff.h

@@ -721 +721 @@
     RT_GCC_EXTENSION uint8_t    FrameOffset : 4;
     /** Unwind opcodes. */
-    IMAGE_UNWIND_CODE   aOpcodes[RT_FLEXIBLE_ARRAY];
+    RT_FLEXIBLE_ARRAY_EXTENSION
+    IMAGE_UNWIND_CODE           aOpcodes[RT_FLEXIBLE_ARRAY];
 } IMAGE_UNWIND_INFO;
 AssertCompileMemberOffset(IMAGE_UNWIND_INFO, aOpcodes, 4);

trunk/include/iprt/formats/udf.h

@@ -792 +792 @@
     /** 0x1b8: Partition maps (length given by @a cbMapTable), data format is
      * defined by UDFPARTMAPHDR, UDFPARTMAPTYPE1 and UDFPARTMAPTYPE2. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     uint8_t         abPartitionMaps[RT_FLEXIBLE_ARRAY];
 } UDFLOGICALVOLUMEDESC;
@@ -925 +926 @@
     uint32_t        cAllocationDescriptors;
     /** 0x18: Allocation descriptors (variable length). */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     UDFEXTENTAD     aAllocationDescriptors[RT_FLEXIBLE_ARRAY];
 } UDFUNALLOCATEDSPACEDESC;
@@ -975 +977 @@
      * the implementation to use.
      */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     uint32_t        aTables[RT_FLEXIBLE_ARRAY];
 } UDFLOGICALVOLINTEGRITYDESC;
@@ -1075 +1078 @@
      * After that is a d-string field with the name of the file, length
      * specified by @a cbName. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     uint8_t         abImplementationUse[RT_FLEXIBLE_ARRAY];
 } UDFFILEIDDESC;
@@ -1358 +1362 @@
     /** 0xb0: Two variable sized fields.  First @a cbExtAttribs bytes of extended
      *  attributes, then @a cbAllocDescs bytes of allocation descriptors. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     uint8_t         abExtAttribs[RT_FLEXIBLE_ARRAY];
 } UDFFILEENTRY;
@@ -1971 +1976 @@
     uint32_t        cbBitmap;
     /** 0x18: The bitmap. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     uint8_t         abBitmap[RT_FLEXIBLE_ARRAY];
 } UDFSPACEBITMAPDESC;
@@ -2000 +2006 @@
     UDFENTITYID     idImplementation;
     /** 0x100: Implementation use data. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     uint8_t         abImplementationUse[RT_FLEXIBLE_ARRAY];
 } UDFPARTITIONINTEGRITYDESC;
@@ -2067 +2074 @@
     /** 0xd8: Two variable sized fields.  First @a cbExtAttribs bytes of extended
      *  attributes, then @a cbAllocDescs bytes of allocation descriptors. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
     uint8_t         abExtAttribs[RT_FLEXIBLE_ARRAY];
 } UDFEXFILEENTRY;