svn commit: r277300 - in head: cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/lockstat cddl/contrib/opensolaris/cmd/mdb/tools/common cddl/contrib/opensolaris/cmd/plockstat cddl/co...

Steven Hartland smh at FreeBSD.org
Sat Jan 17 14:45:06 UTC 2015 

Author: smh
Date: Sat Jan 17 14:44:59 2015
New Revision: 277300
URL: https://svnweb.freebsd.org/changeset/base/277300

Log:
  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

Modified:
  head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
  head/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
  head/cddl/contrib/opensolaris/cmd/lockstat/sym.c
  head/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c
  head/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h
  head/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
  head/cddl/contrib/opensolaris/cmd/sgs/include/alist.h
  head/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h
  head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  head/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
  head/cddl/contrib/opensolaris/common/util/strtolctype.h
  head/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
  head/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c
  head/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  head/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c
  head/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h
  head/cddl/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c
  head/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
  head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
  head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c
  head/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c
  head/cddl/contrib/opensolaris/tools/ctf/cvt/util.c
  head/sys/cddl/contrib/opensolaris/common/util/strtolctype.h
  head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  head/sys/cddl/contrib/opensolaris/uts/common/os/callb.c
  head/sys/cddl/contrib/opensolaris/uts/common/os/fm.c
  head/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
  head/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h
  head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  head/sys/cddl/dev/dtrace/amd64/instr_size.c
  head/sys/cddl/dev/dtrace/dtrace_ioctl.c
  head/sys/cddl/dev/dtrace/i386/instr_size.c
  head/sys/cddl/dev/dtrace/x86/regset.h

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -43,11 +43,11 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #endif
 #include <libgen.h>
-#if defined(sun)
+#ifdef illumos
 #include <libproc.h>
 #endif
 
@@ -101,7 +101,7 @@ static int g_grabanon = 0;
 static const char *g_ofile = NULL;
 static FILE *g_ofp;
 static dtrace_hdl_t *g_dtp;
-#if defined(sun)
+#ifdef illumos
 static char *g_etcfile = "/etc/system";
 static const char *g_etcbegin = "* vvvv Added by DTrace";
 static const char *g_etcend = "* ^^^^ Added by DTrace";
@@ -211,7 +211,7 @@ fatal(const char *fmt, ...)
 static void
 dfatal(const char *fmt, ...)
 {
-#if !defined(sun) && defined(NEED_ERRLOC)
+#if !defined(illumos) && defined(NEED_ERRLOC)
 	char *p_errfile = NULL;
 	int errline = 0;
 #endif
@@ -232,7 +232,7 @@ dfatal(const char *fmt, ...)
 		(void) fprintf(stderr, "%s\n",
 		    dtrace_errmsg(g_dtp, dtrace_errno(g_dtp)));
 	}
-#if !defined(sun) && defined(NEED_ERRLOC)
+#if !defined(illumos) && defined(NEED_ERRLOC)
 	dt_get_errloc(g_dtp, &p_errfile, &errline);
 	if (p_errfile != NULL)
 		printf("File '%s', line %d\n", p_errfile, errline);
@@ -397,7 +397,7 @@ dof_prune(const char *fname)
 	free(buf);
 }
 
-#if defined(sun)
+#ifdef illumos
 static void
 etcsystem_prune(void)
 {
@@ -508,7 +508,7 @@ etcsystem_add(void)
 
 	error("added forceload directives to %s\n", g_ofile);
 }
-#endif
+#endif /* illumos */
 
 static void
 print_probe_info(const dtrace_probeinfo_t *p)
@@ -643,7 +643,7 @@ anon_prog(const dtrace_cmd_t *dcp, dof_h
 	p = (uchar_t *)dof;
 	q = p + dof->dofh_loadsz;
 
-#if defined(sun)
+#ifdef illumos
 	oprintf("dof-data-%d=0x%x", n, *p++);
 
 	while (p < q)
@@ -793,7 +793,7 @@ compile_str(dtrace_cmd_t *dcp)
 static void
 prochandler(struct ps_prochandle *P, const char *msg, void *arg)
 {
-#if defined(sun)
+#ifdef illumos
 	const psinfo_t *prp = Ppsinfo(P);
 	int pid = Pstatus(P)->pr_pid;
 	char name[SIG2STR_MAX];
@@ -807,13 +807,13 @@ prochandler(struct ps_prochandle *P, con
 		return;
 	}
 
-#if defined(sun)
+#ifdef illumos
 	switch (Pstate(P)) {
 #else
 	switch (proc_state(P)) {
 #endif
 	case PS_UNDEAD:
-#if defined(sun)
+#ifdef illumos
 		/*
 		 * Ideally we would like to always report pr_wstat here, but it
 		 * isn't possible given current /proc semantics.  If we grabbed
@@ -831,7 +831,7 @@ prochandler(struct ps_prochandle *P, con
 			notice("pid %d terminated by %d\n", pid,
 			    WTERMSIG(wstatus));
 #endif
-#if defined(sun)
+#ifdef illumos
 		} else if (prp != NULL && WEXITSTATUS(prp->pr_wstat) != 0) {
 			notice("pid %d exited with status %d\n",
 			    pid, WEXITSTATUS(prp->pr_wstat));
@@ -1238,7 +1238,7 @@ installsighands(void)
 	if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
 		(void) sigaction(SIGTERM, &act, NULL);
 
-#if !defined(sun)
+#ifndef illumos
 	if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
 		(void) sigaction(SIGPIPE, &act, NULL);
 
@@ -1720,7 +1720,7 @@ main(int argc, char *argv[])
 
 	case DMODE_ANON:
 		if (g_ofile == NULL)
-#if defined(sun)
+#ifdef illumos
 			g_ofile = "/kernel/drv/dtrace.conf";
 #else
 			/*
@@ -1732,7 +1732,7 @@ main(int argc, char *argv[])
 #endif
 
 		dof_prune(g_ofile); /* strip out any old DOF directives */
-#if defined(sun)
+#ifdef illumos
 		etcsystem_prune(); /* string out any forceload directives */
 #endif
 
@@ -1765,7 +1765,7 @@ main(int argc, char *argv[])
 		 * that itself contains a #pragma D option quiet.
 		 */
 		error("saved anonymous enabling in %s\n", g_ofile);
-#if defined(sun)
+#ifdef illumos
 		etcsystem_add();
 		error("run update_drv(1M) or reboot to enable changes\n");
 #endif

Modified: head/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -46,10 +46,9 @@
 #include <signal.h>
 #include <assert.h>
 
-#if defined(sun)
+#ifdef illumos
 #define	GETOPT_EOF	EOF
 #else
-/* FreeBSD */ 
 #include <sys/time.h>
 #include <sys/resource.h>
 
@@ -57,7 +56,7 @@
 #define	GETOPT_EOF		(-1)
 
 typedef	uintptr_t	pc_t;
-#endif /* defined(sun) */
+#endif
 
 #define	LOCKSTAT_OPTSTR	"x:bths:n:d:i:l:f:e:ckwWgCHEATID:RpPo:V"
 
@@ -214,10 +213,9 @@ static ls_event_info_t g_event_info[LS_M
 	{ 'H',	"Lock",	"Unknown event (type 53)",		"units"	},
 	{ 'H',	"Lock",	"Unknown event (type 54)",		"units"	},
 	{ 'H',	"Lock",	"Unknown event (type 55)",		"units"	},
-#if defined(sun)
+#ifdef illumos
 	{ 'I',	"CPU+PIL", "Profiling interrupt",		"nsec",
 #else
-	/* FreeBSD */
 	{ 'I',	"CPU+Pri_Class", "Profiling interrupt",		"nsec",
 #endif
 	    "profile:::profile-97", NULL },
@@ -231,7 +229,7 @@ static ls_event_info_t g_event_info[LS_M
 	{ 'E',	"Lock",	"Lockstat record failure",		"(N/A)"	},
 };
 
-#if !defined(sun)
+#ifndef illumos
 static char *g_pri_class[] = {
 	"",
 	"Intr",
@@ -598,7 +596,7 @@ filter_add(char **filt, char *what, uint
 		*filt[0] = '\0';
 	}
 
-#if defined(sun)
+#ifdef illumos
 	(void) sprintf(c, "%s(%s >= 0x%p && %s < 0x%p)", *filt[0] != '\0' ?
 	    " || " : "", what, (void *)base, what, (void *)(base + size));
 #else
@@ -676,7 +674,7 @@ dprog_addevent(int event)
 		 * the number of nanoseconds) is the number of nanoseconds
 		 * late -- and it's stored in arg2.
 		 */
-#if defined(sun)
+#ifdef illumos
 		arg0 = "(uintptr_t)curthread->t_cpu + \n"
 		    "\t    curthread->t_cpu->cpu_profile_pil";
 #else
@@ -824,7 +822,7 @@ dprog_compile()
 }
 
 static void
-#if defined(sun)
+#ifdef illumos
 status_fire(void)
 #else
 status_fire(int i)
@@ -1423,7 +1421,7 @@ main(int argc, char **argv)
 		exit(127);
 	}
 
-#if defined(sun)
+#ifdef illumos
 	while (waitpid(child, &status, WEXITED) != child)
 #else
 	while (waitpid(child, &status, 0) != child)
@@ -1468,7 +1466,7 @@ main(int argc, char **argv)
 			dfail("failed to walk aggregate");
 	}
 
-#if defined(sun)
+#ifdef illumos
 	if ((data_buf = memalign(sizeof (uint64_t),
 	    (g_nrecs + 1) * g_recsize)) == NULL)
 #else
@@ -1500,7 +1498,7 @@ main(int argc, char **argv)
 	if (g_gflag) {
 		lsrec_t *newlsp, *oldlsp;
 
-#if defined(sun)
+#ifdef illumos
 		newlsp = memalign(sizeof (uint64_t),
 		    g_nrecs_used * LS_TIME * (g_stkdepth + 1));
 #else
@@ -1664,7 +1662,7 @@ format_symbol(char *buf, uintptr_t addr,
 	else if (symoff == 0)
 		(void) sprintf(buf, "%s", symname);
 	else if (symoff < 16 && bcmp(symname, "cpu[", 4) == 0)	/* CPU+PIL */
-#if defined(sun)
+#ifdef illumos
 		(void) sprintf(buf, "%s+%ld", symname, (long)symoff);
 #else
 		(void) sprintf(buf, "%s+%s", symname, g_pri_class[(int)symoff]);

Modified: head/cddl/contrib/opensolaris/cmd/lockstat/sym.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/lockstat/sym.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/lockstat/sym.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -42,12 +42,11 @@
 #include <libelf.h>
 #include <link.h>
 #include <elf.h>
-#if defined(sun)
+#ifdef illumos
 #include <sys/machelf.h>
 
 #include <kstat.h>
 #else
-/* FreeBSD */
 #include <sys/elf.h>
 #include <sys/ksyms.h>
 #include <sys/param.h>
@@ -66,7 +65,7 @@ static syment_t *symbol_table;
 static int nsyms, maxsyms;
 static char maxsymname[64];
 
-#if defined(sun)
+#ifdef illumos
 #ifdef _ELF64
 #define	elf_getshdr elf64_getshdr
 #else
@@ -105,7 +104,7 @@ remove_symbol(uintptr_t addr)
 			sep->addr = 0;
 }
 
-#if defined(sun)
+#ifdef illumos
 static void
 fake_up_certain_popular_kernel_symbols(void)
 {
@@ -133,8 +132,7 @@ fake_up_certain_popular_kernel_symbols(v
 	}
 	(void) kstat_close(kc);
 }
-#else
-/* FreeBSD */
+#else /* !illumos */
 static void
 fake_up_certain_popular_kernel_symbols(void)
 {
@@ -151,7 +149,7 @@ fake_up_certain_popular_kernel_symbols(v
 		add_symbol(name, addr, sizeof (uintptr_t));
 	}
 }
-#endif /* !defined(sun) */
+#endif /* illumos */
 
 static int
 symcmp(const void *p1, const void *p2)
@@ -177,12 +175,12 @@ symtab_init(void)
 	int		fd;
 	int		i;
 	int		strindex = -1;
-#if !defined(sun)
+#ifndef illumos
 	void		*ksyms;
 	size_t		sz;
 #endif
 
-#if defined(__FreeBSD__)
+#ifndef illumos
 	if ((fd = open("/dev/ksyms", O_RDONLY)) == -1) {
 		if (errno == ENOENT && modfind("ksyms") == -1) {
 			kldload("ksyms");
@@ -196,12 +194,11 @@ symtab_init(void)
 		return (-1);
 #endif
 
-#if defined(sun)
+#ifdef illumos
 	(void) elf_version(EV_CURRENT);
 
 	elf = elf_begin(fd, ELF_C_READ, NULL);
 #else
-	/* FreeBSD */
 	/* 
 	 * XXX - libelf needs to be fixed so it will work with
 	 * non 'ordinary' files like /dev/ksyms.  The following

Modified: head/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -40,7 +40,7 @@ die(char *format, ...)
 {
 	va_list ap;
 	int err = errno;
-#if !defined(sun)
+#ifndef illumos
 	const char *progname = getprogname();
 #endif
 
@@ -54,7 +54,7 @@ die(char *format, ...)
 	if (format[strlen(format) - 1] != '\n')
 		(void) fprintf(stderr, ": %s\n", strerror(err));
 
-#if defined(__FreeBSD__)
+#ifndef illumos
 	exit(0);
 #else
 	exit(1);
@@ -65,7 +65,7 @@ void
 elfdie(char *format, ...)
 {
 	va_list ap;
-#if !defined(sun)
+#ifndef illumos
 	const char *progname = getprogname();
 #endif
 
@@ -79,7 +79,7 @@ elfdie(char *format, ...)
 	if (format[strlen(format) - 1] != '\n')
 		(void) fprintf(stderr, ": %s\n", elf_errmsg(elf_errno()));
 
-#if defined(__FreeBSD__)
+#ifndef illumos
 	exit(0);
 #else
 	exit(1);

Modified: head/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h	Sat Jan 17 14:44:59 2015	(r277300)
@@ -40,7 +40,7 @@ extern int findelfsecidx(Elf *, char *);
 extern void die(char *, ...);
 extern void elfdie(char *, ...);
 
-#if defined(sun)
+#ifdef illumos
 extern const char *progname;
 #endif
 

Modified: head/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(sun)
+#ifdef illumos
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 #endif
 
@@ -505,7 +505,7 @@ getsym(struct ps_prochandle *P, uintptr_
 {
 	char name[256];
 	GElf_Sym sym;
-#if defined(sun)
+#ifdef illumos
 	prsyminfo_t info;
 #else
 	prmap_t *map;
@@ -518,7 +518,7 @@ getsym(struct ps_prochandle *P, uintptr_
 		(void) snprintf(buf, size, "%#lx", addr);
 		return (0);
 	}
-#if defined(sun)
+#ifdef illumos
 	if (info.prs_object == NULL)
 		info.prs_object = "<unknown>";
 
@@ -668,7 +668,7 @@ process_aggregate(const dtrace_aggdata_t
 static void
 prochandler(struct ps_prochandle *P, const char *msg, void *arg)
 {
-#if defined(sun)
+#ifdef illumos
 	const psinfo_t *prp = Ppsinfo(P);
 	int pid = Pstatus(P)->pr_pid;
 #else
@@ -773,7 +773,7 @@ intr(int signo)
 int
 main(int argc, char **argv)
 {
-#if defined(sun)
+#ifdef illumos
 	ucred_t *ucp;
 #endif
 	int err;
@@ -785,7 +785,7 @@ main(int argc, char **argv)
 
 	g_pname = basename(argv[0]);
 	argv[0] = g_pname; /* rewrite argv[0] for getopt errors */
-#if defined(sun)
+#ifdef illumos
 	/*
 	 * Make sure we have the required dtrace_proc privilege.
 	 */
@@ -988,7 +988,7 @@ main(int argc, char **argv)
 
 	if (opt_v)
 		(void) printf("%s: tracing enabled for pid %d\n", g_pname,
-#if defined(sun)
+#ifdef illumos
 		    (int)Pstatus(g_pr)->pr_pid);
 #else
 		    (int)proc_getpid(g_pr));

Modified: head/cddl/contrib/opensolaris/cmd/sgs/include/alist.h
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/sgs/include/alist.h	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/sgs/include/alist.h	Sat Jan 17 14:44:59 2015	(r277300)
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 #include <sys/types.h>
-#if defined(sun)
+#ifdef illumos
 #include <sys/machelf.h>
 #else
 #include <sys/elf.h>

Modified: head/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h	Sat Jan 17 14:44:59 2015	(r277300)
@@ -48,7 +48,7 @@ extern "C" {
 
 #ifndef	_ASM
 #include <sys/types.h>
-#if defined(sun)
+#ifdef illumos
 #include <sys/machelf.h>
 #else
 #include <elf.h>

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -65,7 +65,7 @@
 #include <zfs_prop.h>
 #include <zfs_deleg.h>
 #include <libuutil.h>
-#ifdef sun
+#ifdef illumos
 #include <aclutils.h>
 #include <directory.h>
 #include <idmap.h>
@@ -2391,7 +2391,7 @@ userspace_cb(void *arg, const char *doma
 		/* SMB */
 		char sid[ZFS_MAXNAMELEN + 32];
 		uid_t id;
-#ifdef sun
+#ifdef illumos
 		int err;
 		int flag = IDMAP_REQ_FLG_USE_CACHE;
 #endif
@@ -2402,17 +2402,17 @@ userspace_cb(void *arg, const char *doma
 
 		if (prop == ZFS_PROP_GROUPUSED || prop == ZFS_PROP_GROUPQUOTA) {
 			type = USTYPE_SMB_GRP;
-#ifdef sun
+#ifdef illumos
 			err = sid_to_id(sid, B_FALSE, &id);
 #endif
 		} else {
 			type = USTYPE_SMB_USR;
-#ifdef sun
+#ifdef illumos
 			err = sid_to_id(sid, B_TRUE, &id);
 #endif
 		}
 
-#ifdef sun
+#ifdef illumos
 		if (err == 0) {
 			rid = id;
 			if (!cb->cb_sid2posix) {
@@ -6110,7 +6110,7 @@ unshare_unmount_path(int op, char *path,
 	/*
 	 * Search for the given (major,minor) pair in the mount table.
 	 */
-#ifdef sun
+#ifdef illumos
 	rewind(mnttab_file);
 	while ((ret = getextmntent(mnttab_file, &entry, 0)) == 0) {
 		if (entry.mnt_major == major(statbuf.st_dev) &&

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -112,7 +112,7 @@ vdev_error(const char *fmt, ...)
 	va_end(ap);
 }
 
-#ifdef sun
+#ifdef illumos
 static void
 libdiskmgt_error(int error)
 {
@@ -274,7 +274,7 @@ check_device(const char *path, boolean_t
 
 	return (check_slice(path, force, B_FALSE, isspare));
 }
-#endif	/* sun */
+#endif	/* illumos */
 
 /*
  * Check that a file is valid.  All we can do in this case is check that it's
@@ -290,7 +290,7 @@ check_file(const char *file, boolean_t f
 	pool_state_t state;
 	boolean_t inuse;
 
-#ifdef sun
+#ifdef illumos
 	if (dm_inuse_swap(file, &err)) {
 		if (err)
 			libdiskmgt_error(err);
@@ -377,7 +377,7 @@ check_device(const char *name, boolean_t
 static boolean_t
 is_whole_disk(const char *arg)
 {
-#ifdef sun
+#ifdef illumos
 	struct dk_gpt *label;
 	int	fd;
 	char	path[MAXPATHLEN];
@@ -915,7 +915,7 @@ check_replication(nvlist_t *config, nvli
 	return (ret);
 }
 
-#ifdef sun
+#ifdef illumos
 /*
  * Go through and find any whole disks in the vdev specification, labelling them
  * as appropriate.  When constructing the vdev spec, we were unable to open this
@@ -1019,7 +1019,7 @@ make_disks(zpool_handle_t *zhp, nvlist_t
 
 	return (0);
 }
-#endif	/* sun */
+#endif	/* illumos */
 
 /*
  * Determine if the given path is a hot spare within the given configuration.
@@ -1098,7 +1098,7 @@ is_device_in_use(nvlist_t *config, nvlis
 		 * regardless of what libdiskmgt or zpool_in_use() says.
 		 */
 		if (replacing) {
-#ifdef sun
+#ifdef illumos
 			if (nvlist_lookup_uint64(nv, ZPOOL_CONFIG_WHOLE_DISK,
 			    &wholedisk) == 0 && wholedisk)
 				(void) snprintf(buf, sizeof (buf), "%ss0",
@@ -1422,7 +1422,7 @@ split_mirror_vdev(zpool_handle_t *zhp, c
 			return (NULL);
 		}
 
-#ifdef sun
+#ifdef illumos
 		if (!flags.dryrun && make_disks(zhp, newroot) != 0) {
 			nvlist_free(newroot);
 			return (NULL);
@@ -1507,7 +1507,7 @@ make_root_vdev(zpool_handle_t *zhp, int 
 		return (NULL);
 	}
 
-#ifdef sun
+#ifdef illumos
 	/*
 	 * Run through the vdev specification and label any whole disks found.
 	 */

Modified: head/cddl/contrib/opensolaris/common/util/strtolctype.h
==============================================================================
--- head/cddl/contrib/opensolaris/common/util/strtolctype.h	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/common/util/strtolctype.h	Sat Jan 17 14:44:59 2015	(r277300)
@@ -44,7 +44,7 @@ extern "C" {
  * safe in probe context.
  */
 
-#if defined(sun) &&	(defined(_KERNEL) || defined(_BOOT))
+#if defined(illumos) && (defined(_KERNEL) || defined(_BOOT))
 
 #define	isalnum(ch)	(isalpha(ch) || isdigit(ch))
 #define	isalpha(ch)	(isupper(ch) || islower(ch))

Modified: head/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -34,14 +34,14 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#if defined(sun)
+#ifdef illumos
 #include <dlfcn.h>
 #else
 #include <zlib.h>
 #endif
 #include <gelf.h>
 
-#if defined(sun)
+#ifdef illumos
 #ifdef _LP64
 static const char *_libctf_zlib = "/usr/lib/64/libz.so";
 #else
@@ -58,7 +58,7 @@ static struct {
 static size_t _PAGESIZE;
 static size_t _PAGEMASK;
 
-#if defined(sun)
+#ifdef illumos
 #pragma init(_libctf_init)
 #else
 void    _libctf_init(void) __attribute__ ((constructor));
@@ -66,7 +66,7 @@ void    _libctf_init(void) __attribute__
 void
 _libctf_init(void)
 {
-#if defined(sun)
+#ifdef illumos
 	const char *p = getenv("LIBCTF_DECOMPRESSOR");
 
 	if (p != NULL)
@@ -87,7 +87,7 @@ _libctf_init(void)
 void *
 ctf_zopen(int *errp)
 {
-#if defined(sun)
+#ifdef illumos
 	ctf_dprintf("decompressing CTF data using %s\n", _libctf_zlib);
 
 	if (zlib.z_dlp != NULL)

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -56,13 +56,13 @@
  */
 
 static const char *devnamep = "/dev/dtrace/helper";
-#if defined(sun)
+#ifdef illumos
 static const char *olddevname = "/devices/pseudo/dtrace at 0:helper";
 #endif
 
 static const char *modname;	/* Name of this load object */
 static int gen;			/* DOF helper generation */
-#if defined(sun)
+#ifdef illumos
 extern dof_hdr_t __SUNW_dof;	/* DOF defined in the .SUNW_dof section */
 #endif
 static boolean_t dof_init_debug = B_FALSE;	/* From DTRACE_DOF_INIT_DEBUG */
@@ -90,7 +90,7 @@ dprintf(int debug, const char *fmt, ...)
 	va_end(ap);
 }
 
-#if defined(sun)
+#ifdef illumos
 #pragma init(dtrace_dof_init)
 #else
 static void dtrace_dof_init(void) __attribute__ ((constructor));
@@ -99,7 +99,7 @@ static void dtrace_dof_init(void) __attr
 static void
 dtrace_dof_init(void)
 {
-#if defined(sun)
+#ifdef illumos
 	dof_hdr_t *dof = &__SUNW_dof;
 #else
 	dof_hdr_t *dof = NULL;
@@ -111,14 +111,14 @@ dtrace_dof_init(void)
 #endif
 	dof_helper_t dh;
 	Link_map *lmp = NULL;
-#if defined(sun)
+#ifdef illumos
 	Lmid_t lmid;
 #else
 	u_long lmid = 0;
 #endif
 	int fd;
 	const char *p;
-#if !defined(sun)
+#ifndef illumos
 	Elf *e;
 	Elf_Scn *scn = NULL;
 	Elf_Data *dofdata = NULL;
@@ -141,7 +141,7 @@ dtrace_dof_init(void)
 		return;
 	}
 
-#if defined(sun)
+#ifdef illumos
 	if (dlinfo(RTLD_SELF, RTLD_DI_LMID, &lmid) == -1) {
 		dprintf(1, "couldn't discover link map ID\n");
 		return;
@@ -152,7 +152,7 @@ dtrace_dof_init(void)
 		modname = lmp->l_name;
 	else
 		modname++;
-#if !defined(sun)
+#ifndef illumos
 	elf_version(EV_CURRENT);
 	if ((efd = open(lmp->l_name, O_RDONLY, 0)) < 0) {
 		dprintf(1, "couldn't open file for reading\n");
@@ -215,7 +215,7 @@ dtrace_dof_init(void)
 
 	if ((fd = open64(devnamep, O_RDWR)) < 0) {
 		dprintf(1, "failed to open helper device %s", devnamep);
-#if defined(sun)
+#ifdef illumos
 		/*
 		 * If the device path wasn't explicitly set, try again with
 		 * the old device path.
@@ -237,14 +237,14 @@ dtrace_dof_init(void)
 		dprintf(1, "DTrace ioctl failed for DOF at %p", dof);
 	else {
 		dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof);
-#if !defined(sun)
+#ifndef illumos
 		gen = dh.gen;
 #endif
 	}
 
 	(void) close(fd);
 
-#if !defined(sun)
+#ifndef illumos
 		/* End of while loop */
 		dof = dof_next;
 	}
@@ -254,7 +254,7 @@ dtrace_dof_init(void)
 #endif
 }
 
-#if defined(sun)
+#ifdef illumos
 #pragma fini(dtrace_dof_fini)
 #else
 static void dtrace_dof_fini(void) __attribute__ ((destructor));

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <dt_impl.h>
 #include <assert.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #else
 #include <sys/sysctl.h>
@@ -453,7 +453,7 @@ dt_aggregate_snap_cpu(dtrace_hdl_t *dtp,
 
 	buf->dtbd_cpu = cpu;
 
-#if defined(sun)
+#ifdef illumos
 	if (dt_ioctl(dtp, DTRACEIOC_AGGSNAP, buf) == -1) {
 #else
 	if (dt_ioctl(dtp, DTRACEIOC_AGGSNAP, &buf) == -1) {

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -1888,7 +1888,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 	char **argv = malloc(sizeof (char *) * (argc + 5));
 	FILE *ofp = tmpfile();
 
-#if defined(sun)
+#ifdef illumos
 	char ipath[20], opath[20]; /* big enough for /dev/fd/ + INT_MAX + \0 */
 #endif
 	char verdef[32]; /* big enough for -D__SUNW_D_VERSION=0x%08x + \0 */
@@ -1898,7 +1898,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 
 	int wstat, estat;
 	pid_t pid;
-#if defined(sun)
+#ifdef illumos
 	off64_t off;
 #else
 	off_t off = 0;
@@ -1929,7 +1929,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 		(void) fseeko64(ifp, off, SEEK_SET);
 	}
 
-#if defined(sun)
+#ifdef illumos
 	(void) snprintf(ipath, sizeof (ipath), "/dev/fd/%d", fileno(ifp));
 	(void) snprintf(opath, sizeof (opath), "/dev/fd/%d", fileno(ofp));
 #endif
@@ -1940,7 +1940,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 	    "-D__SUNW_D_VERSION=0x%08x", dtp->dt_vmax);
 	argv[argc++] = verdef;
 
-#if defined(sun)
+#ifdef illumos
 	switch (dtp->dt_stdcmode) {
 	case DT_STDC_XA:
 	case DT_STDC_XT:
@@ -1982,7 +1982,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 	}
 
 	if (pid == 0) {
-#if !defined(sun)
+#ifndef illumos
 		if (isatty(fileno(ifp)) == 0)
 			lseek(fileno(ifp), off, SEEK_SET);
 		dup2(fileno(ifp), 0);

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -35,12 +35,12 @@
 #include <limits.h>
 #include <assert.h>
 #include <ctype.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #endif
 #include <dt_impl.h>
 #include <dt_pq.h>
-#if !defined(sun)
+#ifndef illumos
 #include <libproc_compat.h>
 #endif
 
@@ -2958,7 +2958,7 @@ dt_get_buf(dtrace_hdl_t *dtp, int cpu, d
 	buf->dtbd_size = size;
 	buf->dtbd_cpu = cpu;
 
-#if defined(sun)
+#ifdef illumos
 	if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, buf) == -1) {
 #else
 	if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &buf) == -1) {

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -26,12 +26,12 @@
  */
 
 #include <sys/types.h>
-#if defined(sun)
+#ifdef illumos
 #include <sys/sysmacros.h>
 #endif
 
 #include <strings.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #endif
 #include <assert.h>

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -145,7 +145,7 @@ dtrace_errno(dtrace_hdl_t *dtp)
 	return (dtp->dt_errno);
 }
 
-#if defined(sun)
+#ifdef illumos
 int
 dt_set_errno(dtrace_hdl_t *dtp, int err)
 {

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <assert.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #endif
 

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c	Sat Jan 17 14:44:59 2015	(r277300)
@@ -28,18 +28,18 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#if defined(sun)
+#ifdef illumos
 #include <sys/sysmacros.h>
 #endif
 #include <strings.h>
 #include <stdlib.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #endif
 #include <assert.h>
 #include <errno.h>
 #include <ctype.h>
-#if defined(sun)
+#ifdef illumos
 #include <sys/procfs_isa.h>
 #endif
 #include <limits.h>

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Sat Jan 17 14:44:59 2015	(r277300)
@@ -34,7 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/objfs.h>
-#if !defined(sun)
+#ifndef illumos
 #include <sys/bitmap.h>
 #include <sys/utsname.h>
 #include <sys/ioccom.h>
@@ -45,7 +45,7 @@
 #include <libctf.h>
 #include <dtrace.h>
 #include <gelf.h>
-#if defined(sun)
+#ifdef illumos
 #include <synch.h>
 #endif
 
@@ -142,7 +142,7 @@ typedef struct dt_module {
 	GElf_Addr dm_bss_va;	/* virtual address of BSS */
 	GElf_Xword dm_bss_size;	/* size in bytes of BSS */
 	dt_idhash_t *dm_extern;	/* external symbol definitions */
-#if !defined(sun)
+#ifndef illumos
 	caddr_t dm_reloc_offset;	/* Symbol relocation offset. */
 	uintptr_t *dm_sec_offsets;
 #endif
@@ -296,7 +296,7 @@ struct dtrace_hdl {
 	int dt_version;		/* library version requested by client */
 	int dt_ctferr;		/* error resulting from last CTF failure */
 	int dt_errno;		/* error resulting from last failed operation */
-#if !defined(sun)
+#ifndef illumos
 	const char *dt_errfile;
 	int dt_errline;
 #endif
@@ -305,7 +305,7 @@ struct dtrace_hdl {
 	int dt_fterr;		/* saved errno from failed open of dt_ftfd */
 	int dt_cdefs_fd;	/* file descriptor for C CTF debugging cache */
 	int dt_ddefs_fd;	/* file descriptor for D CTF debugging cache */
-#if defined(sun)
+#ifdef illumos
 	int dt_stdout_fd;	/* file descriptor for saved stdout */
 #else
 	FILE *dt_freopen_fp;	/* file pointer for freopened stdout */
@@ -596,7 +596,7 @@ extern int dt_version_defined(dt_version
 extern char *dt_cpp_add_arg(dtrace_hdl_t *, const char *);
 extern char *dt_cpp_pop_arg(dtrace_hdl_t *);
 
-#if defined(sun)
+#ifdef illumos
 extern int dt_set_errno(dtrace_hdl_t *, int);
 #else
 int _dt_set_errno(dtrace_hdl_t *, int, const char *, int);
@@ -606,7 +606,7 @@ void dt_get_errloc(dtrace_hdl_t *, const
 extern void dt_set_errmsg(dtrace_hdl_t *, const char *, const char *,
     const char *, int, const char *, va_list);
 
-#if defined(sun)
+#ifdef illumos
 extern int dt_ioctl(dtrace_hdl_t *, int, void *);
 #else
 extern int dt_ioctl(dtrace_hdl_t *, u_long, void *);

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Sat Jan 17 12:54:02 2015	(r277299)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Sat Jan 17 14:44:59 2015	(r277300)
@@ -44,7 +44,7 @@
  * We need to undefine lex's input and unput macros so that references to these
  * call the functions provided at the end of this source file.
  */
-#if defined(sun)
+#ifdef illumos
 #undef input
 #undef unput
 #else
@@ -79,7 +79,7 @@
 #endif
 
 static int id_or_type(const char *);
-#if defined(sun)
+#ifdef illumos
 static int input(void);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-head mailing list