Changeset 39332 in vbox

Timestamp:

Nov 16, 2011 1:34:38 PM (13 years ago)

Author:

vboxsync

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

74903

Message:

e1000: fix for unresolved memmove on Windows

Location:

trunk/src/VBox

Files:

• Devices/Network/DevE1000.cpp (modified) (1 diff)
• VMM/VMMR0/VMMR0.def (modified) (1 diff)
• VMM/VMMRC/VMMRC.def (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -3208 +3208 @@
         E1kLog3(("%s Inserting VLAN tag %08x\n",
             INSTANCE(pState), RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16)));
-        /** @todo: nocrt_memmove does not get resolved, fix it! */
-#ifndef RT_OS_WINDOWS
         memmove((uint8_t*)pSg->aSegs[0].pvSeg + 16, (uint8_t*)pSg->aSegs[0].pvSeg + 12, cbFrame - 12);
         *((uint32_t*)pSg->aSegs[0].pvSeg + 3) = RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16);
-#endif
     }
     /* Update the stats */

trunk/src/VBox/VMM/VMMR0/VMMR0.def

@@ -98 +98 @@
     nocrt_memcpy
     memcpy=nocrt_memcpy                 ; not-os2
+    nocrt_memmove
     nocrt_memset
     memset=nocrt_memset                 ; not-os2

trunk/src/VBox/VMM/VMMRC/VMMRC.def

@@ -86 +86 @@
     nocrt_memcpy
     memcpy=nocrt_memcpy                 ; not-os2
+    nocrt_memmove
     nocrt_memset
     memset=nocrt_memset                 ; not-os2