From owner-p4-projects@FreeBSD.ORG  Wed Feb  8 02:17: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 2807916A423; Wed,  8 Feb 2006 02:17:01 +0000 (GMT)
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 DD0F516A420
	for <perforce@freebsd.org>; Wed,  8 Feb 2006 02:17:00 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A264343D45
	for <perforce@freebsd.org>; Wed,  8 Feb 2006 02:17:00 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k182H0d1037906
	for <perforce@freebsd.org>; Wed, 8 Feb 2006 02:17:00 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k182H0x5037901
	for perforce@freebsd.org; Wed, 8 Feb 2006 02:17:00 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 8 Feb 2006 02:17:00 GMT
Message-Id: <200602080217.k182H0x5037901@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91360 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, 08 Feb 2006 02:17:02 -0000

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

Change 91360 by rwatson@rwatson_peppercorn on 2006/02/08 02:16:41

	Darwin's sys/sysctl.h causes a nested include of the host
	sys/audit.h, which contains duplicate type definitions to
	bsm/libbsm.h.  We need our own definitions, so for now, use a
	#define to tell the compiler we already have all the necessary bits
	from sys/audit.h on Apple platforms.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 (text+ko) ====

@@ -26,9 +26,13 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#14 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 $
  */
 
+#ifdef __APPLE__
+#define	_SYS_AUDIT_H		/* Prevent include of sys/audit.h. */
+#endf
+
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>