Changeset 53674 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace

Timestamp:

Jan 2, 2015 12:34:30 PM (10 years ago)

Author:

vboxsync

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

97451

Message:

VBoxDTrace: assertion fix. (r52)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common

Files:

• dtrace/dtrace.c (modified) (2 diffs)
• sys/dtrace_impl.h (modified) (2 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c

@@ -577 +577 @@
 }
 
+#ifndef VBOX /* We have our own assertion machinery. */
 int
 dtrace_assfail(const char *a, const char *f, int l)
@@ -588 +589 @@
         return (a[(uintptr_t)f]);
 }
+#endif
 
 /*

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/sys/dtrace_impl.h

@@ -1276 +1276 @@
 #endif
 
+#ifndef VBOX  /* got our own assert thing */
 /*
  * DTrace Assertions
@@ -1295 +1296 @@
 #define ASSERT(X)       ((void)0)
 #endif
+#endif /* !VBOX */
 
 #ifdef  __cplusplus