[src/trunk]: src/external/cddl/osnet Get DTrace to build again.

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa06ec69a501
branches:  trunk
changeset: 759653:aa06ec69a501
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Dec 14 14:08:42 2010 +0000

description:
Get DTrace to build again.

diffstat:

 external/cddl/osnet/dev/fbt/fbt.c               |  3 ++-
 external/cddl/osnet/dist/uts/common/sys/debug.h |  2 ++
 external/cddl/osnet/dist/uts/common/sys/note.h  |  2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r f62dbc3ae385 -r aa06ec69a501 external/cddl/osnet/dev/fbt/fbt.c
--- a/external/cddl/osnet/dev/fbt/fbt.c Tue Dec 14 13:32:14 2010 +0000
+++ b/external/cddl/osnet/dev/fbt/fbt.c Tue Dec 14 14:08:42 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fbt.c,v 1.6 2010/05/03 09:28:38 darran Exp $   */
+/*     $NetBSD: fbt.c,v 1.7 2010/12/14 14:08:42 tron Exp $     */
 
 /*
  * CDDL HEADER START
@@ -72,6 +72,7 @@
 #include <sys/dtrace.h>
 #include <sys/dtrace_bsd.h>
 #include <sys/kern_ctf.h>
+#include <sys/dtrace_impl.h>
 
 mod_ctf_t *modptr;
 
diff -r f62dbc3ae385 -r aa06ec69a501 external/cddl/osnet/dist/uts/common/sys/debug.h
--- a/external/cddl/osnet/dist/uts/common/sys/debug.h   Tue Dec 14 13:32:14 2010 +0000
+++ b/external/cddl/osnet/dist/uts/common/sys/debug.h   Tue Dec 14 14:08:42 2010 +0000
@@ -47,11 +47,13 @@
 #if defined(__STDC__)
 extern int assfail(const char *, const char *, int);
 #define        VERIFY(EX) ((void)((EX) || assfail(#EX, __FILE__, __LINE__)))
+#ifndef ASSERT
 #if DEBUG
 #define        ASSERT(EX) ((void)((EX) || assfail(#EX, __FILE__, __LINE__)))
 #else
 #define        ASSERT(x)  ((void)0)
 #endif
+#endif
 #else  /* defined(__STDC__) */
 extern int assfail();
 #define        VERIFY(EX) ((void)((EX) || assfail("EX", __FILE__, __LINE__)))
diff -r f62dbc3ae385 -r aa06ec69a501 external/cddl/osnet/dist/uts/common/sys/note.h
--- a/external/cddl/osnet/dist/uts/common/sys/note.h    Tue Dec 14 13:32:14 2010 +0000
+++ b/external/cddl/osnet/dist/uts/common/sys/note.h    Tue Dec 14 14:08:42 2010 +0000
@@ -39,7 +39,7 @@
 #ifndef        _SYS_NOTE_H
 #define        _SYS_NOTE_H
 
-#pragma ident  "%Z%%M% %I%     %E% SMI"
+/* #pragma ident       "%Z%%M% %I%     %E% SMI" */
 
 #ifdef __cplusplus
 extern "C" {