From 71dafcd8444bd3a4d6c1f2a0df10fc4277257b19 Mon Sep 17 00:00:00 2001 From: jb Date: Sat, 26 Apr 2008 04:13:23 +0000 Subject: * Fix a function prototype. * Allow for the different level of indirection between SYSV's ioctl and BSD's. * Map a couple of sysconf definitions to one that FreeBSD has. --- cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'cddl') diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h index 1c04120..895f776 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h @@ -148,7 +148,7 @@ typedef struct dtrace_stmtdesc { dtrace_actdesc_t *dtsd_action_last; /* last action in action list */ void *dtsd_aggdata; /* aggregation data */ void *dtsd_fmtdata; /* type-specific output data */ - void (*dtsd_callback)(); /* callback function for EPID */ + void (*dtsd_callback)(void); /* callback function for EPID */ void *dtsd_data; /* callback data pointer */ dtrace_attribute_t dtsd_descattr; /* probedesc attributes */ dtrace_attribute_t dtsd_stmtattr; /* statement attributes */ @@ -521,7 +521,11 @@ extern int dtrace_probe_info(dtrace_hdl_t *, * entry point to obtain a library handle. */ struct dtrace_vector { +#if defined(sun) int (*dtv_ioctl)(void *, int, void *); +#else + int (*dtv_ioctl)(void *, u_long, void *); +#endif int (*dtv_lookup_by_addr)(void *, GElf_Addr, GElf_Sym *, dtrace_syminfo_t *); int (*dtv_status)(void *, processorid_t); @@ -568,4 +572,9 @@ extern int _dtrace_debug; } #endif +#if !defined(sun) +#define _SC_CPUID_MAX _SC_NPROCESSORS_CONF +#define _SC_NPROCESSORS_MAX _SC_NPROCESSORS_CONF +#endif + #endif /* _DTRACE_H */ -- cgit v1.1