svn commit: r264236 - head/sys/bsm

[Pawel Jakub Dawidek]

Author: pjd
Date: Mon Apr  7 20:44:00 2014
New Revision: 264236
URL: http://svnweb.freebsd.org/changeset/base/264236

Log:
  IFp4 @1192291:
  
  - Don't include sys/caprights.h, leverage the fact that cap_rights_t
    is also defined in sys/types.h.
  - Include sys/types.h directly.
  - For systems that do not have cap_rights_t, define it, so we can use
    it in au_to_rights() prototype.
  
  Discussed with:	rwatson

Modified:
  head/sys/bsm/audit_record.h

Modified: head/sys/bsm/audit_record.h
==============================================================================
--- head/sys/bsm/audit_record.h	Mon Apr  7 19:32:56 2014	(r264235)
+++ head/sys/bsm/audit_record.h	Mon Apr  7 20:44:00 2014	(r264236)
@@ -33,8 +33,8 @@
 #ifndef _BSM_AUDIT_RECORD_H_
 #define _BSM_AUDIT_RECORD_H_
 
+#include <sys/types.h>
 #include <sys/time.h>			/* struct timeval */
-#include <sys/caprights.h>		/* cap_rights_t */
 
 /*
  * Token type identifiers.
@@ -191,6 +191,13 @@ struct sockaddr_un;
 struct vnode_au_info;
 #endif
 
+#ifndef	_CAP_RIGHTS_T_DECLARED
+#define	_CAP_RIGHTS_T_DECLARED
+struct cap_rights;
+
+typedef	struct cap_rights	cap_rights_t;
+#endif
+
 int	 au_open(void);
 int	 au_write(int d, token_t *m);
 int	 au_close(int d, int keep, short event);