Devices

Timestamp:

May 3, 2021 2:21:10 PM (4 years ago)

Author:

vboxsync

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

144172

Message:

Devices/Graphics: attempt to fix mac builds. bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.h

-              r88835
+              r88838
 #endif
-/* GCC complains that 'ISO C++ prohibits anonymous structs' when "-Wpedantic" is enabled. */
-#if RT_GNUC_PREREQ(4, 6)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wpedantic"
-#endif
 /* VMSVGA headers. */
+#include "vmsvga_headers_begin.h"
 #pragma pack(1) /* VMSVGA structures are '__packed'. */
 #include <svga3d_caps.h>
 …
 #include <svga_overlay.h>
 #pragma pack()
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic pop
+#endif
+#include "vmsvga_headers_end.h"
 /**@def FLOAT_FMT_STR

-              r88803
+              r88838
 #include <iprt/types.h>
+/* GCC complains that 'ISO C++ prohibits anonymous structs' when "-Wpedantic" is enabled. */
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wpedantic"
+#endif
+/* VMSVGA headers. */
+#include "vmsvga_headers_begin.h"
 #pragma pack(1) /* VMSVGA structures are '__packed'. */
 #include <svga3d_reg.h>
 #include <VGPU10ShaderTokens.h>
 #pragma pack()
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic pop
+#endif
+#include "vmsvga_headers_end.h"
 typedef struct DXShaderInfo

-              r88830
+              r88838
 #include "svga_types.h"
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wpedantic"
+#endif
+#pragma pack(1)
+#include "vmsvga_headers_begin.h"
+#pragma pack(1) /* VMSVGA structures are '__packed'. */
 #include "svga3d_reg.h"
 #pragma pack()
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic pop
+#endif
+#include "vmsvga_headers_end.h"
 #include "svga_dump.h"

Note: See TracChangeset for help on using the changeset viewer.