Changeset 31508 in vbox

Timestamp:

Aug 10, 2010 8:31:48 AM (15 years ago)

Author:

vboxsync

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

64597

Message:

Windows build fix

Location:

trunk

Files:

• include/VBox/cdefs.h (modified) (1 diff)
• src/VBox/Devices/Storage/testcase/Makefile.kmk (modified) (3 diffs)
• src/VBox/Devices/Storage/testcase/tstVDSetUuidStubs.cpp (modified) (1 diff)

trunk/include/VBox/cdefs.h

@@ -394 +394 @@
  */
 #ifdef IN_VBOXDDU
-# define VBOXDDU_DECL(type) DECLEXPORT(type) VBOXCALL
+# ifdef IN_VBOXDDU_STATIC
+#  define VBOXDDU_DECL(type) type
+# else
+#  define VBOXDDU_DECL(type) DECLEXPORT(type) VBOXCALL
+# endif
 #else
 # define VBOXDDU_DECL(type) DECLIMPORT(type) VBOXCALL

trunk/src/VBox/Devices/Storage/testcase/Makefile.kmk

@@ -50 +50 @@
 ifdef VBOX_WITH_TESTCASES
  PROGRAMS += tstVD tstVD-2 tstVDCopy tstVDSnap tstVDShareable tstVDSetUuid
- if1of ($(KBUILD_TARGET), darwin freebsd linux solaris)
+ if1of ($(KBUILD_TARGET), darwin freebsd linux win solaris)
   PROGRAMS += VBoxFixHdd
  endif
@@ -83 +83 @@
  else ifeq ($(KBUILD_TARGET),darwin)
   VBoxFixHdd_LIBS += iconv
+ else ifeq ($(KBUILD_TARGET),win)
+  VBoxFixHdd_SDKS.win = VBOX_NTDLL VBOX_ZLIB WINPSDK $(VBOX_WINDDK)
  endif
  tstVD_SOURCES  = tstVD.cpp
@@ -102 +104 @@
  VBoxFixHdd_DEFS += VBOX_WITH_NEW_IO_CODE
  endif
- VBoxFixHdd_DEFS += VBOX_HDD_NO_DYNAMIC_BACKENDS
+ VBoxFixHdd_DEFS += VBOX_HDD_NO_DYNAMIC_BACKENDS IN_VBOXDDU IN_VBOXDDU_STATIC IN_RT_R3
 endif
 

trunk/src/VBox/Devices/Storage/testcase/tstVDSetUuidStubs.cpp

@@ -18 +18 @@
 #include <iprt/assert.h>
 
+#ifndef RT_OS_WINDOWS
 RTDECL(bool) RTAssertShouldPanic(void)
 {
     return true;
 }
+#endif