From owner-p4-projects@FreeBSD.ORG  Wed Jun  7 00:26:01 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 DA0ED16C872; Wed,  7 Jun 2006 00:08:17 +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 DA14016D4FC
	for <perforce@freebsd.org>; Tue,  6 Jun 2006 23:33:36 +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 A10A843D46
	for <perforce@freebsd.org>; Tue,  6 Jun 2006 23:33:36 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56NVkHA042847
	for <perforce@freebsd.org>; Tue, 6 Jun 2006 23:31:46 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56NVkke042844
	for perforce@freebsd.org; Tue, 6 Jun 2006 23:31:46 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 6 Jun 2006 23:31:46 GMT
Message-Id: <200606062331.k56NVkke042844@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 98708 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, 07 Jun 2006 00:26:02 -0000

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

Change 98708 by jb@jb_freebsd2 on 2006/06/06 23:31:33

	On FreeBSD, use the prototype for dtrace_gethrestime() from sys/time.h,
	not the DTrace one here. The reason is that I chose not to polute the
	FreeBSD headers with hrtime_t which is really just a uint64_t.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#8 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#8 (text) ====

@@ -1261,7 +1261,9 @@
     int, uintptr_t);
 extern int dtrace_assfail(const char *, const char *, int);
 extern int dtrace_attached(void);
+#if defined(sun)
 extern hrtime_t dtrace_gethrestime(void);
+#endif
 
 #ifdef __sparc
 extern void dtrace_flush_windows(void);