PERFORCE change 75791 for review

[Robert Watson]

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

Change 75791 by rwatson at 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
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message