PERFORCE change 90830 for review

[Robert Watson]

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

Change 90830 by rwatson at rwatson_peppercorn on 2006/01/31 21:01:03

	Sync to OpenBSM.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 edit

Differences ...

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

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#21 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 $
  */
 
 #ifndef _BSM_AUDIT_H
@@ -327,8 +327,7 @@
 };
 typedef	struct au_evclass_map	au_evclass_map_t;
 
-#ifndef _KERNEL
-
+#if !defined(_KERNEL) && !defined(KERNEL)
 int	audit(const void *, int);
 int	auditon(int, void *, int);
 int	auditctl(const char *);
@@ -338,8 +337,7 @@
 int	setaudit(const struct auditinfo *);
 int	getaudit_addr(struct auditinfo_addr *, int);
 int	setaudit_addr(const struct auditinfo_addr *, int);
-
-#endif /* !_KERNEL */
+#endif /* defined(_KERNEL) || defined(KERNEL) */
 
 __END_DECLS