diff options
| author | smh <smh@FreeBSD.org> | 2015-01-17 14:44:59 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2015-01-17 14:44:59 +0000 |
| commit | 55c26d898b33386bf97f560dfeaf3b2cdc029c31 (patch) | |
| tree | 09e9633064b6303a8afc6891fff761eb6e399cee /cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h | |
| parent | c13d70380d4abc45ee62004df19a9837a468fb7a (diff) | |
| download | FreeBSD-src-55c26d898b33386bf97f560dfeaf3b2cdc029c31.zip FreeBSD-src-55c26d898b33386bf97f560dfeaf3b2cdc029c31.tar.gz | |
Mechanically convert cddl sun #ifdef's to illumos
Since the upstream for cddl code is now illumos not sun, mechanically
convert all sun #ifdef's to illumos #ifdef's which have been used in all
newer code for some time.
Also do a manual pass to correct the use if #ifdef comments as per style(9)
as well as few uses of #if defined(__FreeBSD__) vs #ifndef illumos.
MFC after: 1 month
Sponsored by: Multiplay
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h index 6f88e6d..f0088a9 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h @@ -37,7 +37,7 @@ #include <stdio.h> #include <gelf.h> #include <libproc.h> -#if !defined(sun) +#ifndef illumos #include <rtld_db.h> #endif @@ -554,7 +554,7 @@ extern int dtrace_probe_info(dtrace_hdl_t *, * entry point to obtain a library handle. */ struct dtrace_vector { -#if defined(sun) +#ifdef illumos int (*dtv_ioctl)(void *, int, void *); #else int (*dtv_ioctl)(void *, u_long, void *); @@ -605,7 +605,7 @@ extern int _dtrace_debug; } #endif -#if !defined(sun) +#ifndef illumos #define _SC_CPUID_MAX _SC_NPROCESSORS_CONF #define _SC_NPROCESSORS_MAX _SC_NPROCESSORS_CONF #endif |
