From owner-p4-projects@FreeBSD.ORG  Thu Apr 27 20:42:49 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 E032916A402; Thu, 27 Apr 2006 20:42:48 +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 A770816A400
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 20:42:48 +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 7583843D49
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 20:42:48 +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 k3RKgmP6080897
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 20:42:48 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3RKgmHZ080891
	for perforce@freebsd.org; Thu, 27 Apr 2006 20:42:48 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Apr 2006 20:42:48 GMT
Message-Id: <200604272042.k3RKgmHZ080891@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 96238 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: Thu, 27 Apr 2006 20:42:49 -0000

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

Change 96238 by jb@jb_freebsd2 on 2006/04/27 20:42:26

	Convert the last ioctl.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_map.c#3 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_map.c#3 (text) ====

@@ -331,7 +331,11 @@
 		agg->dtagd_id = id;
 		agg->dtagd_nrecs = 1;
 
+#if defined(sun)
 		if (dt_ioctl(dtp, DTRACEIOC_AGGDESC, agg) == -1) {
+#else
+		if (dt_ioctl(dtp, DTRACEIOC_AGGDESC, &agg) == -1) {
+#endif
 			rval = dt_set_errno(dtp, errno);
 			free(agg);
 			return (rval);
@@ -350,7 +354,11 @@
 			if ((agg = nagg) == NULL)
 				return (dt_set_errno(dtp, EDT_NOMEM));
 
+#if defined(sun)
 			rval = dt_ioctl(dtp, DTRACEIOC_AGGDESC, agg);
+#else
+			rval = dt_ioctl(dtp, DTRACEIOC_AGGDESC, &agg);
+#endif
 
 			if (rval == -1) {
 				rval = dt_set_errno(dtp, errno);