Changeset 69686 in vbox

Timestamp:

Nov 14, 2017 1:29:33 PM (7 years ago)

Author:

vboxsync

Message:

/include/: darwin header tweaks

Location:

trunk/include

Files:

• Makefile.kmk (modified) (5 diffs)
• VBox/Graphics/VBoxUhgsmi.h (modified) (3 diffs)
• VBox/Graphics/VBoxVideoHost3D.h (modified) (1 diff)
• VBox/vmm/cpum.h (modified) (2 diffs)
• VBox/vmm/cpumctx.h (modified) (1 diff)
• VBox/vmm/pdmaudioifs.h (modified) (6 diffs)
• iprt/bldprog-strtab-template.cpp.h (modified) (3 diffs)
• iprt/cdefs.h (modified) (1 diff)
• iprt/nocrt/math.h (modified) (1 diff)

trunk/include/Makefile.kmk

@@ -20 +20 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-LIBRARIES += SyntaxVBoxIncludeR3 SyntaxVBoxIncludeR0 SyntaxVBoxIncludeRC
+LIBRARIES += SyntaxVBoxIncludeR3 SyntaxVBoxIncludeR0
 
 # Omit headers that are using C++ features and upsets gcc.
@@ -106 +106 @@
                 VBox/VBoxNetCfg-win.h \
                 VBox/usblib-win.h \
+                VBox/com/microatl.h \
         ,$(VBOX_HDRS_GCC_ONLY)) \
         \
@@ -152 +153 @@
 SyntaxVBoxIncludeR3_TEMPLATE = VBOXMAINEXE
 SyntaxVBoxIncludeR3_DEFS = VBOX_WITH_HGCM
-SyntaxVBoxIncludeR3_CDEFS = VBOX_WITHOUT_UNNAMED_UNIONS
+SyntaxVBoxIncludeR3_CDEFS = IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS
 SyntaxVBoxIncludeR3_SOURCES := \
         $(addprefix $(PATH_OBJ)/include/c/,  $(addsuffix .c,  $(basename $(VBOX_HDRS_ALL_R3_C)))) \
@@ -161 +162 @@
 SyntaxVBoxIncludeR0_TEMPLATE = VBoxR0
 SyntaxVBoxIncludeR0_DEFS = VBOX_WITH_HGCM
-SyntaxVBoxIncludeR0_CDEFS = VBOX_WITHOUT_UNNAMED_UNIONS
+SyntaxVBoxIncludeR0_CDEFS = IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS
 SyntaxVBoxIncludeR0_SOURCES := \
         $(addprefix $(PATH_OBJ)/include/c/,  $(addsuffix .c,  $(basename $(VBOX_HDRS_ALL_R0_C)))) \
@@ -167 +168 @@
 SyntaxVBoxIncludeR0_CLEAN = $(SyntaxVBoxIncludeR0_SOURCES)
 
-SyntaxVBoxIncludeRC_TEMPLATE = VBoxRc
-SyntaxVBoxIncludeRC_DEFS = VBOX_WITH_HGCM
-SyntaxVBoxIncludeRC_CDEFS = VBOX_WITHOUT_UNNAMED_UNIONS
-SyntaxVBoxIncludeRC_SOURCES := \
-        $(addprefix $(PATH_OBJ)/include/c/,  $(addsuffix .c,  $(basename $(VBOX_HDRS_ALL_RC_C)))) \
-        $(addprefix $(PATH_OBJ)/include/cpp/,$(addsuffix .cpp,$(basename $(VBOX_HDRS_ALL_RC))))
-SyntaxVBoxIncludeRC_CLEAN = $(SyntaxVBoxIncludeRC_SOURCES)
-
+ifdef VBOX_WITH_RAW_MODE
+ LIBRARIES += SyntaxVBoxIncludeRC
+ SyntaxVBoxIncludeRC_TEMPLATE = VBoxRc
+ SyntaxVBoxIncludeRC_DEFS = VBOX_WITH_HGCM
+ SyntaxVBoxIncludeRC_CDEFS = IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS
+ SyntaxVBoxIncludeRC_SOURCES := \
+        $(addprefix $(PATH_OBJ)/include/c/,  $(addsuffix .c,  $(basename $(VBOX_HDRS_ALL_RC_C)))) \
+        $(addprefix $(PATH_OBJ)/include/cpp/,$(addsuffix .cpp,$(basename $(VBOX_HDRS_ALL_RC))))
+ SyntaxVBoxIncludeRC_CLEAN = $(SyntaxVBoxIncludeRC_SOURCES)
+endif
 
 

trunk/include/VBox/Graphics/VBoxUhgsmi.h

@@ -43 +43 @@
             uint32_t fCommand    : 1;
             uint32_t Reserved    : 31;
-        };
+        } RT_STRUCT_NM(s);
         uint32_t Value;
-    };
+    } RT_UNION_NM(u);
 } VBOXUHGSMI_BUFFER_TYPE_FLAGS;
 
@@ -60 +60 @@
             uint32_t bLockEntire : 1;
             uint32_t Reserved    : 27;
-        };
+        } RT_STRUCT_NM(s);
         uint32_t Value;
-    };
+    } RT_UNION_NM(u);
 } VBOXUHGSMI_BUFFER_LOCK_FLAGS;
 
@@ -76 +76 @@
             uint32_t bEntireBuffer          : 1;
             uint32_t Reserved               : 28;
-        };
+        } RT_STRUCT_NM(s);
         uint32_t Value;
-    };
+    } RT_UNION_NM(u);
 } VBOXUHGSMI_BUFFER_SUBMIT_FLAGS, *PVBOXUHGSMI_BUFFER_SUBMIT_FLAGS;
 

trunk/include/VBox/Graphics/VBoxVideoHost3D.h

@@ -124 +124 @@
         void *pvVRamBase;
         uint64_t uAlignment;
-    };
+    } RT_UNION_NM(u);
     uint64_t cbVRam;
     PPDMLED pLed;

trunk/include/VBox/vmm/cpum.h

@@ -1210 +1210 @@
 /** @} */
 
-#ifndef VBOX_WITHOUT_UNNAMED_UNIONS
+#ifndef IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS
 
 /**
@@ -1453 +1453 @@
     return CPUMIsGuestInSvmNestedHwVirtMode(pCtx) || CPUMIsGuestInVmxNestedHwVirtMode(pCtx);
 }
-#endif /* VBOX_WITHOUT_UNNAMED_UNIONS */
+#endif /* IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS */
 
 /** @} */

trunk/include/VBox/vmm/cpumctx.h

@@ -135 +135 @@
 # define CPUM_UNION_NM(a_Nm)  a_Nm
 # define CPUM_STRUCT_NM(a_Nm) a_Nm
-#elif defined(VBOX_WITHOUT_UNNAMED_UNIONS)
+#elif defined(IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS)
 # define CPUM_UNION_NM(a_Nm)  a_Nm
 # define CPUM_STRUCT_NM(a_Nm) a_Nm

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -661 +661 @@
             PDMAUDMIXBUFVOL Volume;
         } From;
-    };
+    } RT_UNION_NM(u);
 } PDMAUDMIXBUFCONVOPTS;
 /** Pointer to conversion parameters for the audio mixer.   */
@@ -918 +918 @@
         PDMAUDIOSTREAMIN   In;
         PDMAUDIOSTREAMOUT  Out;
-    };
+    } RT_UNION_NM(u);
     /** Data to backend-specific stream data.
      *  This data block will be casted by the backend to access its backend-dependent data.
@@ -926 +926 @@
     /** Size (in bytes) of the backend-specific stream data. */
     size_t                 cbBackend;
-} PDMAUDIOSTREAM, *PPDMAUDIOSTREAM;
+} PDMAUDIOSTREAM;
 
 /** Pointer to a audio connector interface. */
@@ -1037 +1037 @@
             PDMAUDIODEVICECBTYPE enmType;
         } Device;
-    };
+    } RT_UNION_NM(u);
     /** Pointer to context data. Optional. */
     void               *pvCtx;
@@ -1241 +1241 @@
     DECLR3CALLBACKMEMBER(int, pfnRegisterCallbacks, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOCBRECORD paCallbacks, size_t cCallbacks));
 
-} PDMIAUDIOCONNECTOR, *PPDMIAUDIOCONNECTOR;
+} PDMIAUDIOCONNECTOR;
 
 /** PDMIAUDIOCONNECTOR interface ID. */
@@ -1471 +1471 @@
     DECLR3CALLBACKMEMBER(void, pfnStreamCaptureEnd, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream));
 
-} PDMIHOSTAUDIO, *PPDMIHOSTAUDIO;
+} PDMIHOSTAUDIO;
 
 /** PDMIHOSTAUDIO interface ID. */

trunk/include/iprt/bldprog-strtab-template.cpp.h

@@ -157 +157 @@
 } BLDPROGSTRTAB;
 typedef BLDPROGSTRTAB *PBLDPROGSTRTAB;
+
+#if RT_CLANG_PREREQ(4, 0)
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wunused-function"
+#endif
 
 
@@ -900 +905 @@
 #else
         else
-            fprintf(pOut, "\\x%02", (unsigned)uch);
+            fprintf(pOut, "\\x%02x", (unsigned)uch);
         NOREF(pThis);
 #endif
@@ -1034 +1039 @@
 }
 
+#if RT_CLANG_PREREQ(4, 0)
+#  pragma GCC diagnostic pop
+#endif
+
 #endif /* __cplusplus && IN_RING3 */
 
+

trunk/include/iprt/cdefs.h

@@ -2394 +2394 @@
 #endif
 
+/** @def RT_UNION_NM
+ * For compilers (like DTrace) that does not grok nameless unions, we have a
+ * little hack to make them palatable.
+ */
+/** @def RT_STRUCT_NM
+ * For compilers (like DTrace) that does not grok nameless structs (it is
+ * non-standard C++), we have a little hack to make them palatable.
+ */
+#ifdef IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS
+# define RT_UNION_NM(a_Nm)  a_Nm
+# define RT_STRUCT_NM(a_Nm) a_Nm
+#else
+# define RT_UNION_NM(a_Nm)
+# define RT_STRUCT_NM(a_Nm)
+#endif
+
 /**
  * Checks if the value is a power of two.

trunk/include/iprt/nocrt/math.h

@@ -57 +57 @@
 #define __GNUC_PREREQ__(ma, mi) 0
 #endif
+#undef  __pure2 /* darwin: avoid conflict with system headers when doing syntax checking of the headers */
 #define __pure2