Changeset 38739 in vbox for trunk/src/VBox

Timestamp:

Sep 13, 2011 2:36:55 PM (13 years ago)

Author:

vboxsync

Message:

Another Assert redefinition bites the dust.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Files:

• common/VBoxMPCommon.h (modified) (1 diff)
• common/VBoxMPUtils.h (modified) (1 diff)
• wddm/VBoxMPWddm.h (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.h

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox Miniport common functions used by XPDM/WDDM drivers

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.h

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox Miniport common utils header

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.h

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox WDDM Miniport driver
@@ -20 +19 @@
 #define ___VBoxMPWddm_h___
 
+#ifndef DEBUG_misha
+# ifdef Assert
+#  error "VBoxMPWddm.h must be included first."
+# endif
+# define RT_NO_STRICT
+#endif
 #include "common/VBoxMPUtils.h"
 #include "common/VBoxMPDevExt.h"
@@ -28 +33 @@
 NTSTATUS DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath);
 RT_C_DECLS_END
-
-#ifndef DEBUG_misha
-# ifdef Assert
-#  undef Assert
-#  define Assert(_a) do{}while(0)
-# endif
-# ifdef AssertBreakpoint
-#  undef AssertBreakpoint
-#  define AssertBreakpoint() do{}while(0)
-# endif
-# ifdef AssertFailed
-#  undef AssertFailed
-#  define AssertFailed() do{}while(0)
-# endif
-#endif
 
 PVOID vboxWddmMemAlloc(IN SIZE_T cbSize);
@@ -89 +79 @@
 
 #endif /* #ifndef ___VBoxMPWddm_h___ */
+