Changeset 7054 in vbox

Timestamp:

Feb 20, 2008 5:17:19 PM (17 years ago)

Author:

vboxsync

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

28289

Message:

fixed debug windows build.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• common/string/memcmp.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1045 +1045 @@
 RuntimeGuestR0_SOURCES.$(BUILD_TARGET) := $(RuntimeR0Drv_SOURCES.$(BUILD_TARGET))
 RuntimeGuestR0_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH) := $(RuntimeR0Drv_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
+RuntimeGuestR0_SOURCES.win             += common/string/memcmp.cpp
 ifdef VBOX_USE_VCC80
 RuntimeGuestR0_SOURCES.win += \
         common/string/memchr.cpp \
-        common/string/memcmp.cpp \
         common/string/memcpy.cpp \
         common/string/memset.cpp \
@@ -1071 +1071 @@
         $(filter-out generic/RTLogWriteUser-generic.cpp,$(RuntimeR0Drv_SOURCES)) \
         $(RuntimeR0Drv_SOURCES.win) \
-        VBox/logbackdoor.cpp
+        VBox/logbackdoor.cpp \
+        common/string/memcmp.cpp
 ifdef VBOX_USE_VCC80
 RuntimeW32GuestR0_SOURCES += \
         common/string/memchr.cpp \
-        common/string/memcmp.cpp \
         common/string/memcpy.cpp \
         common/string/memset.cpp \

trunk/src/VBox/Runtime/common/string/memcmp.cpp

@@ -48 +48 @@
 __checkReturn int __cdecl memcmp(__in_bcount_opt(_Size) const void * pvDst, __in_bcount_opt(_Size) const void * pvSrc, __in size_t cb)
 # else
-int memcmp(const void *pvDst, const void *pvSrc, size_t cb)
+int __cdecl memcmp(const void *pvDst, const void *pvSrc, size_t cb)
 # endif
 #else