From owner-p4-projects@FreeBSD.ORG  Sat Apr 23 11:33:36 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8888516A4D0; Sat, 23 Apr 2005 11:33:36 +0000 (GMT)
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 4C7DC16A4CE
	for <perforce@freebsd.org>; Sat, 23 Apr 2005 11:33:36 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 307B643D2D
	for <perforce@freebsd.org>; Sat, 23 Apr 2005 11:33:36 +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 j3NBXai9062772
	for <perforce@freebsd.org>; Sat, 23 Apr 2005 11:33:36 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 j3NBXZZo062769
	for perforce@freebsd.org; Sat, 23 Apr 2005 11:33:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 23 Apr 2005 11:33:35 GMT
Message-Id: <200504231133.j3NBXZZo062769@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>
Subject: PERFORCE change 75791 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 23 Apr 2005 11:33:37 -0000

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

Change 75791 by rwatson@rwatson_paprika on 2005/04/23 11:32:40

	Use __APPLE__ instead of DARWIN.  Ifdef more carefully.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#3 (text+ko) ====

@@ -45,7 +45,7 @@
 
 #include <bsm/audit.h>
 #include <bsm/audit_record.h>
-#ifdef DARWIN
+#ifdef __APPLE__
 #include <mach/mach.h>		/* audit_token_t */
 #endif
 
@@ -840,7 +840,7 @@
 void au_print_tok(FILE *outfp, tokenstr_t *tok, char *del, char raw, char sfrm);
 __END_DECLS
 
-#ifdef DARWIN
+#ifdef __APPLE__
 /*
  * Apple-internal "wrapping" and utility definitions and prototypes.  
  */
@@ -850,6 +850,7 @@
 #ifdef __APPLE_API_PRIVATE
 #define __BSM_INTERNAL_NOTIFY_KEY "com.apple.audit.change"
 #endif
+#endif /* !__APPLE__ */
 
 /* 
  * au_get_state() return values 
@@ -909,8 +910,6 @@
 int au_get_state(void);
 __END_DECLS
 
-#endif /* !DARWIN */
-
 /* OpenSSH compatibility */
 #define cannot_audit(x) (au_get_state() == AUC_NOAUDIT)
 
@@ -1150,6 +1149,7 @@
 /* END au_write() WRAPPERS */
 
 
+#ifdef  __APPLE__
 /*
  * audit_token_to_au32()
  *
@@ -1196,6 +1196,7 @@
 	pid_t			*pidp,
 	au_asid_t		*asidp,
 	au_tid_t		*tidp);
+#endif /* !__APPLE__ */
 
 
 __END_DECLS