From owner-p4-projects@FreeBSD.ORG  Sun Mar 19 14:34:21 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 6546C16A423; Sun, 19 Mar 2006 14:34:21 +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 2A1A916A420
	for <perforce@freebsd.org>; Sun, 19 Mar 2006 14:34:21 +0000 (UTC)
	(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 CC1DB43D45
	for <perforce@freebsd.org>; Sun, 19 Mar 2006 14:34:20 +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 k2JEYK23002115
	for <perforce@freebsd.org>; Sun, 19 Mar 2006 14:34:20 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 k2JEYJIE002112
	for perforce@freebsd.org; Sun, 19 Mar 2006 14:34:19 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 19 Mar 2006 14:34:19 GMT
Message-Id: <200603191434.k2JEYJIE002112@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 93568 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, 19 Mar 2006 14:34:21 -0000

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

Change 93568 by rwatson@rwatson_peppercorn on 2006/03/19 14:34:11

	Normalize nested include guards.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#13 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#2 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#22 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#13 (text+ko) ====

@@ -34,8 +34,8 @@
  * necessary for the kernel as a whole to interact with the audit subsystem.
  */
 
-#ifndef _BSM_AUDIT_KERNEL_H
-#define	_BSM_AUDIT_KERNEL_H
+#ifndef _SECURITY_AUDIT_KERNEL_H_
+#define	_SEUCRITY_AUDIT_KERNEL_H_
 
 #ifndef _KERNEL
 #error "no user-serviceable parts inside"
@@ -240,4 +240,4 @@
 
 #endif /* AUDIT */
 
-#endif /* !_BSM_AUDIT_KERNEL_H */
+#endif /* !_SECURITY_AUDIT_KERNEL_H_ */

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#2 (text+ko) ====

@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef	_SYS_SECURITY_AUDIT_AUDIT_IOCTL_H_
-#define	_SYS_SECURITY_AUDIT_AUDIT_IOCTL_H_
+#ifndef	_SECURITY_AUDIT_AUDIT_IOCTL_H_
+#define	_SECURITY_AUDIT_AUDIT_IOCTL_H_
 
 #define	AUDITPIPE_IOBASE	'A'
 
@@ -48,4 +48,4 @@
 #define	AUDITPIPE_GET_DROPS	_IOR(AUDITPIPE_IOBASE, 102, u_int64_t)
 #define	AUDITPIPE_GET_TRUNCATES	_IOR(AUDITPIPE_IOBASE, 103, u_int64_t)
 
-#endif /* _SYS_SECURITY_AUDIT_AUDIT_IOCTL_H_ */
+#endif /* _SECURITY_AUDIT_AUDIT_IOCTL_H_ */

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#22 (text+ko) ====

@@ -34,8 +34,8 @@
  * within the audit implementation.
  */
 
-#ifndef _BSM_AUDIT_PRIVATE_H
-#define	_BSM_AUDIT_PRIVATE_H
+#ifndef _SECURITY_AUDIT_PRIVATE_H_
+#define	_SECURITY_AUDIT_PRIVATE_H_
 
 #ifndef _KERNEL
 #error "no user-serviceable parts inside"
@@ -338,4 +338,4 @@
  */
 void			 audit_pipe_submit(void *record, u_int record_len);
 
-#endif /* ! _BSM_AUDIT_PRIVATE_H */
+#endif /* ! _SECURITY_AUDIT_PRIVATE_H_ */