Changeset 76376 in vbox for trunk/include/VBox

Timestamp:

Dec 22, 2018 10:32:24 PM (6 years ago)

Author:

vboxsync

Message:

VBoxUhgsmi.h: GCC doesn't like unnamed sub-structures in C++ code, so ditched them for VBOXUHGSMI_BUFFER_TYPE_FLAGS, VBOXUHGSMI_BUFFER_LOCK_FLAGS and VBOXUHGSMI_BUFFER_SUBMIT_FLAGS. Also skipped the outer wrapper structures for each of these types as all it contained was an unnamed union, so just make the typedefs unions straight away. Fixed some hungarian inconsistency between the three types ('b' == byte, not boolean in VBox, don't forget).

File:

• trunk/include/VBox/Graphics/VBoxUhgsmi.h (modified) (1 diff)

trunk/include/VBox/Graphics/VBoxUhgsmi.h

@@ -35 +35 @@
 typedef struct VBOXUHGSMI_BUFFER *PVBOXUHGSMI_BUFFER;
 
-typedef struct VBOXUHGSMI_BUFFER_TYPE_FLAGS
+typedef union VBOXUHGSMI_BUFFER_TYPE_FLAGS
 {
-    union
+    uint32_t Value;
+    struct
     {
-        struct
-        {
-            uint32_t fCommand    : 1;
-            uint32_t Reserved    : 31;
-        } RT_STRUCT_NM(s);
-        uint32_t Value;
-    } RT_UNION_NM(u);
+        uint32_t fCommand       : 1;
+        uint32_t Reserved       : 31;
+    } s;
 } VBOXUHGSMI_BUFFER_TYPE_FLAGS;
 
-typedef struct VBOXUHGSMI_BUFFER_LOCK_FLAGS
+typedef union VBOXUHGSMI_BUFFER_LOCK_FLAGS
 {
-    union
+    uint32_t Value;
+    struct
     {
-        struct
-        {
-            uint32_t bReadOnly   : 1;
-            uint32_t bWriteOnly  : 1;
-            uint32_t bDonotWait  : 1;
-            uint32_t bDiscard    : 1;
-            uint32_t bLockEntire : 1;
-            uint32_t Reserved    : 27;
-        } RT_STRUCT_NM(s);
-        uint32_t Value;
-    } RT_UNION_NM(u);
+        uint32_t fReadOnly      : 1;
+        uint32_t fWriteOnly     : 1;
+        uint32_t fDonotWait     : 1;
+        uint32_t fDiscard       : 1;
+        uint32_t fLockEntire    : 1;
+        uint32_t Reserved       : 27;
+    } s;
 } VBOXUHGSMI_BUFFER_LOCK_FLAGS;
 
-typedef struct VBOXUHGSMI_BUFFER_SUBMIT_FLAGS
+typedef union VBOXUHGSMI_BUFFER_SUBMIT_FLAGS
 {
-    union
+    uint32_t Value;
+    struct
     {
-        struct
-        {
-            uint32_t bHostReadOnly          : 1;
-            uint32_t bHostWriteOnly         : 1;
-            uint32_t bDoNotRetire           : 1; /**< the buffer will be used in a subsequent command */
-            uint32_t bEntireBuffer          : 1;
-            uint32_t Reserved               : 28;
-        } RT_STRUCT_NM(s);
-        uint32_t Value;
-    } RT_UNION_NM(u);
+        uint32_t fHostReadOnly  : 1;
+        uint32_t fHostWriteOnly : 1;
+        uint32_t fDoNotRetire   : 1; /**< the buffer will be used in a subsequent command */
+        uint32_t fEntireBuffer  : 1;
+        uint32_t Reserved       : 28;
+    } s;
 } VBOXUHGSMI_BUFFER_SUBMIT_FLAGS, *PVBOXUHGSMI_BUFFER_SUBMIT_FLAGS;