[src/trunk]: src/external/cddl/osnet DTrace: fix a few build issues for tools...

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

details:   https://anonhg.NetBSD.org/src/rev/06ee2fbcb42c
branches:  trunk
changeset: 752936:06ee2fbcb42c
user:      darran <darran%NetBSD.org@localhost>
date:      Thu Mar 11 23:28:07 2010 +0000

description:
DTrace: fix a few build issues for tools and the dtrace provider operation
interface.

diffstat:

 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c |   6 +++---
 external/cddl/osnet/dist/uts/common/sys/dtrace.h    |  11 +++++++++++
 external/cddl/osnet/sys/sys/types.h                 |   7 ++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diffs (81 lines):

diff -r ffcf8a56a426 -r 06ee2fbcb42c external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Thu Mar 11 23:26:33 2010 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Thu Mar 11 23:28:07 2010 +0000
@@ -344,13 +344,13 @@
 }
 
 static dtrace_pops_t   dtrace_provider_ops = {
-       (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop,
+       (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop,
 #if defined(sun)
        (void (*)(void *, modctl_t *))dtrace_nullop,
 #else
        (void (*)(void *, dtrace_modctl_t *))dtrace_nullop,
 #endif
-       (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
+       (int (*)(void *, dtrace_id_t, void *))dtrace_nullop,
        (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
        (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
        (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
@@ -7443,7 +7443,7 @@
        if (pops->dtps_provide == NULL) {
                ASSERT(pops->dtps_provide_module != NULL);
                provider->dtpv_pops.dtps_provide =
-                   (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop;
+                   (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop;
        }
 
        if (pops->dtps_provide_module == NULL) {
diff -r ffcf8a56a426 -r 06ee2fbcb42c external/cddl/osnet/dist/uts/common/sys/dtrace.h
--- a/external/cddl/osnet/dist/uts/common/sys/dtrace.h  Thu Mar 11 23:26:33 2010 +0000
+++ b/external/cddl/osnet/dist/uts/common/sys/dtrace.h  Thu Mar 11 23:28:07 2010 +0000
@@ -2299,6 +2299,7 @@
 extern void dtrace_getfsr(uint64_t *);
 #endif
 
+#if defined(sun)
 #define        DTRACE_CPUFLAG_ISSET(flag) \
        (cpu_core[curcpu_id].cpuc_dtrace_flags & (flag))
 
@@ -2307,6 +2308,16 @@
 
 #define        DTRACE_CPUFLAG_CLEAR(flag) \
        (cpu_core[curcpu_id].cpuc_dtrace_flags &= ~(flag))
+#else
+#define        DTRACE_CPUFLAG_ISSET(flag) \
+       (cpu_core[cpu_number()].cpuc_dtrace_flags & (flag))
+
+#define        DTRACE_CPUFLAG_SET(flag) \
+       (cpu_core[cpu_number()].cpuc_dtrace_flags |= (flag))
+
+#define        DTRACE_CPUFLAG_CLEAR(flag) \
+       (cpu_core[cpu_number()].cpuc_dtrace_flags &= ~(flag))
+#endif
 
 #endif /* _KERNEL */
 
diff -r ffcf8a56a426 -r 06ee2fbcb42c external/cddl/osnet/sys/sys/types.h
--- a/external/cddl/osnet/sys/sys/types.h       Thu Mar 11 23:26:33 2010 +0000
+++ b/external/cddl/osnet/sys/sys/types.h       Thu Mar 11 23:28:07 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.10 2010/03/10 23:41:56 darran Exp $        */
+/*     $NetBSD: types.h,v 1.11 2010/03/11 23:28:07 darran Exp $        */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -68,10 +68,15 @@
 #else
 #include <sys/stdint.h>
 #endif
+#ifdef _NETBSD_SOURCE
+#include_next <sys/types.h>
+#include_next <sys/ccompile.h>
+#else
 #define _NETBSD_SOURCE
 #include_next <sys/types.h>
 #include_next <sys/ccompile.h>
 #undef _NETBSD_SOURCE
+#endif
 
 #ifndef _KERNEL
 #include <stdarg.h>