Module Name: src
Committed By: tron
Date: Tue Dec 14 14:08:43 UTC 2010
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/external/cddl/osnet/dist/uts/common/sys: debug.h note.h
Log Message:
Get DTrace to build again.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/uts/common/sys/debug.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/uts/common/sys/note.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.6 src/external/cddl/osnet/dev/fbt/fbt.c:1.7
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.6 Mon May 3 09:28:38 2010
+++ src/external/cddl/osnet/dev/fbt/fbt.c Tue Dec 14 14:08:42 2010
@@ -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;
Index: src/external/cddl/osnet/dist/uts/common/sys/debug.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/debug.h:1.1.1.2 src/external/cddl/osnet/dist/uts/common/sys/debug.h:1.2
--- src/external/cddl/osnet/dist/uts/common/sys/debug.h:1.1.1.2 Sat Feb 27 22:31:53 2010
+++ src/external/cddl/osnet/dist/uts/common/sys/debug.h Tue Dec 14 14:08:42 2010
@@ -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__)))
Index: src/external/cddl/osnet/dist/uts/common/sys/note.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/note.h:1.1.1.1 src/external/cddl/osnet/dist/uts/common/sys/note.h:1.2
--- src/external/cddl/osnet/dist/uts/common/sys/note.h:1.1.1.1 Fri Aug 7 18:33:48 2009
+++ src/external/cddl/osnet/dist/uts/common/sys/note.h Tue Dec 14 14:08:42 2010
@@ -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" {
