Changeset 63459 in vbox for trunk/src

Timestamp:

Aug 15, 2016 7:51:18 AM (8 years ago)

Author:

vboxsync

Message:

gcc 6 compile fixes

Location:

trunk/src/VBox

Files:

• Devices/EFI/DevSmc.cpp (modified) (1 diff)
• Devices/Network/slirp/ip_icmp.c (modified) (1 diff)
• Devices/USB/linux/USBProxyDevice-linux.cpp (modified) (2 diffs)
• ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_program.c (modified) (3 diffs)
• Main/include/DisplayImpl.h (modified) (1 diff)
• Main/src-all/DisplayResampleImage.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/DevSmc.cpp

@@ -1388 +1388 @@
     /* Fend off unsupported versions. */
     if (   uVersion != SMC_SAVED_STATE_VERSION
+#if SMC_SAVED_STATE_VERSION != SMC_SAVED_STATE_VERSION_BAKA
         && uVersion != SMC_SAVED_STATE_VERSION_BAKA
+#endif
         && uVersion != SMC_SAVED_STATE_VERSION_BAKA + 1)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;

trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

@@ -64 +64 @@
 /* The message sent when emulating PING */
 /* Be nice and tell them it's just a psuedo-ping packet */
+#if 0
 static const char icmp_ping_msg[] = "This is a psuedo-PING packet used by Slirp to emulate ICMP ECHO-REQUEST packets.\n";
+#endif
 
 /* list of actions for icmp_error() on RX of an icmp message */

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

@@ -1504 +1504 @@
             for (i = 0; i < pUrb->cIsocPkts; i++)
             {
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
                 pUrbLnx->KUrb.iso_frame_desc[i].length = pUrb->aIsocPkts[i].cb;
                 pUrbLnx->KUrb.iso_frame_desc[i].actual_length = 0;
                 pUrbLnx->KUrb.iso_frame_desc[i].status = 0x7fff;
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic pop
+#endif
             }
             break;
@@ -1823 +1830 @@
                 for (i = 0, off = 0; i < pUrb->cIsocPkts; i++)
                 {
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
                     pUrb->aIsocPkts[i].enmStatus = vusbProxyLinuxStatusToVUsbStatus(pUrbLnx->KUrb.iso_frame_desc[i].status);
                     Assert(pUrb->aIsocPkts[i].off == off);
                     pUrb->aIsocPkts[i].cb = pUrbLnx->KUrb.iso_frame_desc[i].actual_length;
                     off += pUrbLnx->KUrb.iso_frame_desc[i].length;
+#if RT_GNUC_PREREQ(4, 6)
+# pragma GCC diagnostic pop
+#endif
                 }
             }

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c

@@ -2167 +2167 @@
                 yybegin(YYS_CLAUSE);
 
+        rv = NULL;
         if ((err = setjmp(yypcb->pcb_jmpbuf)) != 0)
                 goto out;

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_program.c

@@ -1285 +1285 @@
         }
     }
-    else if (target == GL_VERTEX_PROGRAM_ARB || target == GL_VERTEX_PROGRAM_NV) {
+    else if (   target == GL_VERTEX_PROGRAM_ARB
+#if GL_VERTEX_PROGRAM_ARB != GL_VERTEX_PROGRAM_NV
+             || target == GL_VERTEX_PROGRAM_NV
+#endif
+            ) {
         prog = p->currentVertexProgram;
         if (index >= g->limits.maxVertexProgramLocalParams) {
@@ -1639 +1643 @@
         params[3] = p->fragmentParameters[index][3];
     }
-    else if (target == GL_VERTEX_PROGRAM_ARB || target == GL_VERTEX_PROGRAM_NV) {
+    else if (   target == GL_VERTEX_PROGRAM_ARB
+#if GL_VERTEX_PROGRAM_ARB != GL_VERTEX_PROGRAM_NV
+             || target == GL_VERTEX_PROGRAM_NV
+#endif
+             ) {
         if (index >= g->limits.maxVertexProgramEnvParams) {
             crStateError(__LINE__, __FILE__, GL_INVALID_VALUE,
@@ -1694 +1702 @@
         DIRTY(pb->fragmentEnvParameters, g->neg_bitid);
     }
-    else if (target == GL_VERTEX_PROGRAM_ARB || target == GL_VERTEX_PROGRAM_NV) {
+    else if (   target == GL_VERTEX_PROGRAM_ARB
+#if GL_VERTEX_PROGRAM_ARB != GL_VERTEX_PROGRAM_NV
+             || target == GL_VERTEX_PROGRAM_NV
+#endif
+             ) {
         if (index >= g->limits.maxVertexProgramEnvParams) {
             crStateError(__LINE__, __FILE__, GL_INVALID_VALUE,

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -528 +528 @@
 
 /* helper function, code in DisplayResampleImage.cpp */
+#if 0
 void gdImageCopyResampled(uint8_t *dst, uint8_t *src,
                             int dstX, int dstY, int srcX, int srcY,
                             int dstW, int dstH, int srcW, int srcH);
+#endif
 
 void BitmapScale32(uint8_t *dst, int dstW, int dstH,

trunk/src/VBox/Main/src-all/DisplayResampleImage.cpp

@@ -82 +82 @@
         (b))
 
+#if 0 /* unused */
 void gdImageCopyResampled (uint8_t *dst,
                       uint8_t *src,
@@ -195 +196 @@
     }
 }
+#endif
 
 /* Fast integer implementation for 32 bpp bitmap scaling.