From owner-p4-projects@FreeBSD.ORG  Wed Apr 19 19:49:06 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AE98116A408; Wed, 19 Apr 2006 19:49:06 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5CCE516A404
	for <perforce@freebsd.org>; Wed, 19 Apr 2006 19:49:06 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A8E1343D48
	for <perforce@freebsd.org>; Wed, 19 Apr 2006 19:49:05 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3JJn5VO076561
	for <perforce@freebsd.org>; Wed, 19 Apr 2006 19:49:05 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3JJn5Ln076558
	for perforce@freebsd.org; Wed, 19 Apr 2006 19:49:05 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 19 Apr 2006 19:49:05 GMT
Message-Id: <200604191949.k3JJn5Ln076558@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95614 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Apr 2006 19:49:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=95614

Change 95614 by jb@jb_freebsd2 on 2006/04/19 19:48:47

	Include another compatibility header to allow us to share the
	dm_info field. We don't do much with it, but it makes the code cleaner
	in places.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#4 (text) ====

@@ -38,6 +38,7 @@
 #include <opensolaris/compat/unistd.h>
 #include <opensolaris/compat/sys/time.h>
 #include <opensolaris/compat/sys/bitmap.h>
+#include <opensolaris/compat/sys/objfs.h>
 #include <sys/utsname.h>
 #endif
 #include <setjmp.h>
@@ -115,9 +116,7 @@
 	struct dt_module *dm_next; /* pointer to next module in hash chain */
 	const dt_modops_t *dm_ops; /* pointer to data model's ops vector */
 	Elf *dm_elf;		/* libelf handle for module object */
-#if defined(sun)
 	objfs_info_t dm_info;	/* object filesystem private info */
-#endif
 	ctf_sect_t dm_symtab;	/* symbol table for module */
 	ctf_sect_t dm_strtab;	/* string table for module */
 	ctf_sect_t dm_ctdata;	/* CTF data for module */