Date: Wed, 17 Apr 2002 11:54:28 -0700 (PDT) From: Chris Vance <cvance@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9929 for review Message-ID: <200204171854.g3HIsSM50632@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204171854.g3HIsSM50632>