PERFORCE change 40092 for review

[Robert Watson]

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

Change 40092 by rwatson at rwatson_tislabs on 2003/10/21 08:14:55

	Integrate C++ism from the FreeBSD main tree to the TrustedBSD
	base tree to bring the framework components into sync for
	the merge of the MAC Framework breakout to the main tree.

Affected files ...

.. //depot/projects/trustedbsd/base/sys/sys/mac.h#33 integrate

Differences ...

==== //depot/projects/trustedbsd/base/sys/sys/mac.h#33 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sys/mac.h,v 1.45 2003/08/29 02:43:57 rwatson Exp $
+ * $FreeBSD: src/sys/sys/mac.h,v 1.46 2003/10/02 03:07:51 rwatson Exp $
  */
 /*
  * Userland/kernel interface for Mandatory Access Control.
@@ -76,6 +76,7 @@
  * Extended non-POSIX.1e interfaces that offer additional services
  * available from the userland and kernel MAC frameworks.
  */
+__BEGIN_DECLS
 int	 mac_execve(char *fname, char **argv, char **envv, mac_t _label);
 int	 mac_free(mac_t _label);
 int	 mac_from_text(mac_t *_label, const char *_text);
@@ -96,6 +97,7 @@
 int	 mac_set_proc(const mac_t _label);
 int	 mac_syscall(const char *_policyname, int _call, void *_arg);
 int	 mac_to_text(mac_t mac, char **_text);
+__END_DECLS
 
 #else /* _KERNEL */
 
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message