PERFORCE change 93568 for review

[Robert Watson]

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

Change 93568 by rwatson at 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_ */