From owner-p4-projects@FreeBSD.ORG  Wed Apr 12 02:55:25 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 69F5516A407; Wed, 12 Apr 2006 02:55:25 +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 444B616A404
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 02:55:25 +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 82FC243D55
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 02:55:24 +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 k3C2tOFv060387
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 02:55:24 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C2tO09060384
	for perforce@freebsd.org; Wed, 12 Apr 2006 02:55:24 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 12 Apr 2006 02:55:24 GMT
Message-Id: <200604120255.k3C2tO09060384@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 95041 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, 12 Apr 2006 02:55:25 -0000

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

Change 95041 by jb@jb_freebsd2 on 2006/04/12 02:55:22

	Change the location of the header files which translate the FreeBSD definitions
	into OpenSolaris ones. It's better to put these in the
	/usr/src/contrib/opensolaris tree so that they aren't present on a FreeBSD
	system unless the OpenSolaris code is being used.
	
	Then a compiler commands can use:
	
	-I${.CURDIR}/../(..)/contrib
	
	and the customised OpenSolaris source can use things like:
	
	#include "opensolaris/compat/sys/types.h"
	
	to get things defined like OpenSolaris would (such as uint_t instead of
	FreeBSD's u_int_t).

Affected files ...

.. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#3 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#3 (text+ko) ====

@@ -11,12 +11,13 @@
 
 
 CFLAGS+=	-I${.CURDIR}/../../.. \
+		-I${.CURDIR}/../../../contrib \
 		-I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/common
 
 .if ${MACHINE_ARCH} == "i386"
-CFLAGS+=-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
+CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .endif
 
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/tools/common