Module Name: src
Committed By: darran
Date: Thu Feb 25 00:18:44 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: ctfmerge.c
src/external/cddl/osnet/sys/sys: types.h
Log Message:
DTrace: fix CTF tools for non-toolchain build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/types.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/dist/tools/ctf/cvt/ctfmerge.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.4 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.5
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.4 Wed Feb 24 21:53:26 2010
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Thu Feb 25 00:18:44 2010
@@ -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)
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.4 src/external/cddl/osnet/sys/sys/types.h:1.5
--- src/external/cddl/osnet/sys/sys/types.h:1.4 Wed Feb 24 21:53:26 2010
+++ src/external/cddl/osnet/sys/sys/types.h Thu Feb 25 00:18:44 2010
@@ -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
