From owner-p4-projects@FreeBSD.ORG  Sat Oct 20 23:44:22 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C2C0316A419; Sat, 20 Oct 2007 23:44:21 +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 71BEE16A417
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 23:44:20 +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 3833C13C43E
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 23:44:20 +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 l9KNiKT6074959
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 23:44:20 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KNiJUh074956
	for perforce@freebsd.org; Sat, 20 Oct 2007 23:44:19 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 20 Oct 2007 23:44:19 GMT
Message-Id: <200710202344.l9KNiJUh074956@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 127862 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: Sat, 20 Oct 2007 23:44:22 -0000

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

Change 127862 by jb@jb_freebsd1 on 2007/10/20 23:44:11

	Prevent Solaris-specific things from clashing with FreeBSD's
	definitions.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 edit
.. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 (text+ko) ====

@@ -111,6 +111,7 @@
 #define	L_MAXMIN	L_MAXMIN32
 #endif
 
+#if defined(sun)
 #ifdef _KERNEL
 
 /* major part of a device internal to the kernel */
@@ -171,6 +172,8 @@
 			    NODEV : (((dev_t)(x) >> L_BITSMINOR) & L_MAXMAJ))
 #define	geteminor(x)	(minor_t)((x) & L_MAXMIN)
 
+#endif /* sun */
+
 /*
  * These are versions of the kernel routines for compressing and
  * expanding long device numbers that don't return errors.

==== //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 (text+ko) ====

@@ -111,6 +111,7 @@
 #define	L_MAXMIN	L_MAXMIN32
 #endif
 
+#if defined(sun)
 #ifdef _KERNEL
 
 /* major part of a device internal to the kernel */
@@ -171,6 +172,8 @@
 			    NODEV : (((dev_t)(x) >> L_BITSMINOR) & L_MAXMAJ))
 #define	geteminor(x)	(minor_t)((x) & L_MAXMIN)
 
+#endif /* sun */
+
 /*
  * These are versions of the kernel routines for compressing and
  * expanding long device numbers that don't return errors.