[src/trunk]: src/external/cddl/osnet DTrace: fix CTF tools for non-toolchain ...

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

details:   https://anonhg.NetBSD.org/src/rev/376ec77e34ed
branches:  trunk
changeset: 752394:376ec77e34ed
user:      darran <darran%NetBSD.org@localhost>
date:      Thu Feb 25 00:18:44 2010 +0000

description:
DTrace: fix CTF tools for non-toolchain build.

diffstat:

 external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c |  6 +++++-
 external/cddl/osnet/sys/sys/types.h               |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 70f64de3fd81 -r 376ec77e34ed external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Thu Feb 25 00:14:10 2010 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Thu Feb 25 00:18:44 2010 +0000
@@ -177,9 +177,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#define _NETBSD_SOURCE
+#ifndef _NETBSD_SOURCE
+#define _NETBSD_SOURCE /* XXX TBD fix this */
 #include <unistd.h>
 #undef _NETBSD_SOURCE
+#else
+#include <unistd.h>
+#endif
 #include <pthread.h>
 #include <assert.h>
 #if defined(sun)
diff -r 70f64de3fd81 -r 376ec77e34ed external/cddl/osnet/sys/sys/types.h
--- a/external/cddl/osnet/sys/sys/types.h       Thu Feb 25 00:14:10 2010 +0000
+++ b/external/cddl/osnet/sys/sys/types.h       Thu Feb 25 00:18:44 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.4 2010/02/24 21:53:26 darran Exp $ */
+/*     $NetBSD: types.h,v 1.5 2010/02/25 00:18:44 darran Exp $ */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -65,9 +65,13 @@
  */
 
 #include <sys/stdint.h>
+#ifndef _NETBSD_SOURCE
 #define _NETBSD_SOURCE         /* XXX TBD fix this */
 #include_next <sys/types.h>
 #undef _NETBSD_SOURCE
+#else
+#include_next <sys/types.h>
+#endif
 #include_next <sys/ccompile.h>
 
 #ifndef _KERNEL