Changeset 64324 in vbox

Timestamp:

Oct 19, 2016 4:50:12 PM (9 years ago)

Author:

vboxsync

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

111400

Message:

gcc 6.2 fix

Location:

trunk/src/VBox

Files:

• Devices/USB/linux/USBProxyDevice-linux.cpp (modified) (2 diffs)
• Main/src-server/linux/HostDnsServiceLinux.cpp (modified) (1 diff)

trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp ¶

@@ -111 +111 @@
 typedef struct USBPROXYURBLNX
 {
-    /** The kernel URB data */
+    /** The kernel URB data. */
+#if RT_GNUC_PREREQ(4, 6)
+    /* gcc 6.2 complains about the [] member of KUrb */
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wpedantic"
+#endif
     struct usbdevfs_urb             KUrb;
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic pop
+#endif
     /** Space filler for the isochronous packets. */
     struct usbdevfs_iso_packet_desc aIsocPktsDonUseTheseUseTheOnesInKUrb[8];
@@ -122 +130 @@
     struct USBPROXYURBLNX           *pSplitNext;
     /** Don't report these back. */
-    bool                             fCanceledBySubmit;
+    bool                            fCanceledBySubmit;
     /** This split element is reaped. */
-    bool                             fSplitElementReaped;
+    bool                            fSplitElementReaped;
     /** Size to transfer in remaining fragments of a split URB */
-    uint32_t                         cbSplitRemaining;
+    uint32_t                        cbSplitRemaining;
 } USBPROXYURBLNX, *PUSBPROXYURBLNX;
 

trunk/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp ¶

@@ -35 +35 @@
 #include <linux/limits.h>
 
+/* Workaround for <sys/cdef.h> defining __flexarr to [] which beats us in
+ * struct inotify_event (char name __flexarr). */
+#include <sys/cdefs.h>
+#undef __flexarr
+#define __flexarr [0]
 #include <sys/inotify.h>
 #include <sys/types.h>