Changeset 66828 in vbox

Timestamp:

May 8, 2017 4:54:39 PM (8 years ago)

Author:

vboxsync

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

115275

Message:

Devices: Adjustments for Visual C++ v12 / Visual Studio 2013. New warnings.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/shaderlib/libWineStub/include/wine/port.h (modified) (1 diff)
• Network/slirp/bsd/kern/uipc_mbuf.c (modified) (1 diff)
• Network/slirp/ip_icmpwin.c (modified) (1 diff)
• Network/slirp/tftp.c (modified) (1 diff)
• Network/testcase/tstIntNetR0.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/shaderlib/libWineStub/include/wine/port.h

@@ -267 +267 @@
 
 #ifndef HAVE_ISINF
+# undef isinf /* VBox: _MSC_VER >= RT_MSC_VER_VC120 has complicated macro implementation in math.h */
 int isinf(double x);
 #endif
 
 #ifndef HAVE_ISNAN
+# undef isnan /* VBox: _MSC_VER >= RT_MSC_VER_VC120 has complicated macro implementation in math.h */
 int isnan(double x);
 #endif

trunk/src/VBox/Devices/Network/slirp/bsd/kern/uipc_mbuf.c

@@ -1232 +1232 @@
         int count, space;
 
-        if (len > (MHLEN - dstoff))
+        if (len > (int)(MHLEN - dstoff))
                 goto bad;
         MGET(m, M_DONTWAIT, n->m_type);

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

@@ -381 +381 @@
         reqsize = reply->DataSize;
         if (   (reply->Options.Flags & IP_FLAG_DF) != 0
-            && sizeof(struct ip) + sizeof(struct icmp_echo) + reqsize > if_mtu)
+            && sizeof(struct ip) + sizeof(struct icmp_echo) + reqsize > (size_t)if_mtu)
             return;
 

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

@@ -729 +729 @@
      *  than buffer for name storage.
      */
-    AssertReturnVoid(   cbFileName < cbPayload
+    AssertReturnVoid(   (ssize_t)cbFileName < cbPayload
                      && cbFileName < TFTP_FILENAME_MAX /* current limit in tftp session handle */
                      && cbFileName);

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -101 +101 @@
 static uint32_t         g_cbTransfer = _1M * 384;
 /** Fake session handle. */
-const PSUPDRVSESSION    g_pSession   = (PSUPDRVSESSION)0xdeadface;
+const PSUPDRVSESSION    g_pSession   = (PSUPDRVSESSION)(uintptr_t)0xdeadface;