Page MenuHomeFreeBSD
Files F136742218

D27884.id81791.diff
No OneTemporary
Actions

D27884.id81791.diff
View Options

diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -64,6 +64,13 @@
FILESDIR= /usr/lib/dtrace
FILESMODE= ${NOBINMODE}
+INCSGROUPS= INCS SYSINCS
+SYSINCSDIR= ${INCLUDEDIR}/sys
+INCS+= ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
+SYSINCS+= ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
+SYSINCS+= ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
+SYSINCS+= ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h
+
WARNS?= 1
CFLAGS+= -DIN_BASE
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
@@ -49,10 +49,20 @@
#ifndef _ASM
-#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/stdint.h>
#ifdef _KERNEL
#include <sys/endian.h>
#endif
+#if !defined(IN_BASE) && !defined(_KERNEL)
+/* Compatibility types to allow including the CTF API */
+typedef unsigned int zoneid_t;
+typedef unsigned char uchar_t;
+typedef unsigned short ushort_t;
+typedef unsigned int uint_t;
+typedef unsigned long ulong_t;
+typedef int processorid_t;
+#else
#include <sys/modctl.h>
#include <sys/processor.h>
#include <sys/cpuvar.h>
@@ -63,9 +73,9 @@
#include <sys/proc.h>
#include <sys/types.h>
#include <sys/ucred.h>
+#endif
typedef int model_t;
#include <sys/ctf_api.h>
-#include <sys/stdint.h>
/*
* DTrace Universal Constants and Typedefs

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 20, 5:02 AM (12 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25702546
Default Alt Text
D27884.id81791.diff (1 KB)

Event Timeline