From owner-p4-projects  Wed Apr 17 11:54:35 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F422737B41E; Wed, 17 Apr 2002 11:54:28 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 52FE637B41D
	for <perforce@freebsd.org>; Wed, 17 Apr 2002 11:54:28 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3HIsSM50632
	for perforce@freebsd.org; Wed, 17 Apr 2002 11:54:28 -0700 (PDT)
	(envelope-from cvance@tislabs.com)
Date: Wed, 17 Apr 2002 11:54:28 -0700 (PDT)
Message-Id: <200204171854.g3HIsSM50632@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
Subject: PERFORCE change 9929 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9929

Change 9929 by cvance@cvance_korben on 2002/04/17 11:54:05

	Some of the changes to fix userspace builds broke the kernel build.
	Fix those.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#3 edit
... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#3 edit
... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#3 (text+ko) ====

@@ -14,7 +14,6 @@
  */
 
 #ifdef __FreeBSD__
-#include <unistd.h>
 
 #include <security/sebsd/flask.h>
 #include <security/sebsd/sebsd.h>
@@ -22,7 +21,10 @@
 #include <security/sebsd/ss/security.h>
 
 #ifdef _KERNEL
+#include <sys/malloc.h>
 MALLOC_DECLARE(M_SEBSD_AVC);
+#else /* _KERNEL */
+#include <unistd.h>
 #endif /* _KERNEL */
 
 #else /* __FreeBSD__ */

==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#3 (text+ko) ====


==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#3 (text+ko) ====

@@ -12,18 +12,21 @@
 /*
  * Implementation of the security services.
  */
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#ifdef __FreeBSD__
+
+#ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#endif /* FreeBSD _KERNEL */
+#include <sys/malloc.h>
+#else /* _KERNEL */
+#include <errno.h>
+#endif /* _KERNEL */
+#endif /* __FreeBSD__ */
 
-#ifdef __FreeBSD__
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#endif /* __FreeBSD__ */
 
 #include <security/sebsd/linux-compat.h>
 #include <security/sebsd/flask.h>

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message