From owner-p4-projects@FreeBSD.ORG  Sun Oct 28 23:13:15 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 16A4416A41A; Sun, 28 Oct 2007 23:13:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D08E816A418
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 23:13:14 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C19BA13C494
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 23:13:14 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNDEHc063030
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 23:13:14 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNDEaP063027
	for perforce@freebsd.org; Sun, 28 Oct 2007 23:13:14 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 28 Oct 2007 23:13:14 GMT
Message-Id: <200710282313.l9SNDEaP063027@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 128258 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: Sun, 28 Oct 2007 23:13:15 -0000

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

Change 128258 by jb@jb_freebsd1 on 2007/10/28 23:13:10

	Move compatibility definitions in here rather than having them
	enabled by _SOLARIS_C_SOURCE in the main FreeBSD headers.

Affected files ...

.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#2 edit
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/types.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#2 (text+ko) ====

@@ -31,6 +31,13 @@
 
 #include_next <sys/time.h>
 
+#define SEC		1
+#define MILLISEC	1000
+#define MICROSEC	1000000
+#define NANOSEC		1000000000
+
+typedef longlong_t	hrtime_t;
+
 #ifdef _KERNEL
 #define	lbolt	((gethrtime() * hz) / NANOSEC)
 #define	lbolt64	(int64_t)(lbolt)
@@ -53,6 +60,15 @@
 #define	gethrestime_sec()	(time_second)
 #define	gethrestime(ts)		getnanotime(ts)
 
+#else
+
+static __inline hrtime_t gethrtime(void) {
+	struct timespec ts;
+	clock_gettime(CLOCK_UPTIME,&ts);
+	return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec);
+}
+
+
 #endif	/* _KERNEL */
 
 #endif	/* !_OPENSOLARIS_SYS_TIME_H_ */

==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/types.h#2 (text+ko) ====

@@ -39,6 +39,18 @@
 #define	MAXNAMELEN	256
 
 typedef	struct timespec	timestruc_t;
+typedef u_int		uint_t;
+typedef u_char		uchar_t;
+typedef u_short		ushort_t;
+typedef u_long		ulong_t;
+typedef long long	longlong_t;  
+typedef unsigned long long	u_longlong_t;
+typedef off_t		off64_t;
+typedef id_t		taskid_t;
+typedef id_t		projid_t;
+typedef id_t		poolid_t;
+typedef id_t		zoneid_t;
+typedef id_t		ctid_t;
 
 #ifdef _KERNEL
 
@@ -53,6 +65,12 @@
 
 #else
 
+#if defined(__XOPEN_OR_POSIX)
+typedef enum { _B_FALSE, _B_TRUE }	boolean_t;
+#else
+typedef enum { B_FALSE, B_TRUE }	boolean_t;
+#endif /* defined(__XOPEN_OR_POSIX) */
+
 typedef	longlong_t	offset_t;
 typedef	u_longlong_t	u_offset_t;
 typedef	uint64_t	upad64_t;