diff options
| author | bde <bde@FreeBSD.org> | 2003-11-14 21:18:04 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2003-11-14 21:18:04 +0000 |
| commit | 29faf9e47052f4559ee204783d6091f63361d8ca (patch) | |
| tree | 29d0f6b26986dda6a92c92f8c2f9f02b18f54966 /sys/security | |
| parent | 192df7a5bb0d8225b515fb61c5fca981b837690c (diff) | |
| download | FreeBSD-src-29faf9e47052f4559ee204783d6091f63361d8ca.zip FreeBSD-src-29faf9e47052f4559ee204783d6091f63361d8ca.tar.gz | |
Reduced prequisites by only using MALLOC_DECLARE() if it is defined.
This fixes a dependency of mac_label.c on namespace pollution in
<vm/uma.h>.
Similarly for SYSCTL_DECL() although I had no problems with it. This
probably makes some includes of <sys/sysctl.h> bogus.
Diffstat (limited to 'sys/security')
| -rw-r--r-- | sys/security/mac/mac_internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index 957057b..f4a1598 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -39,18 +39,22 @@ /* * MAC Framework sysctl namespace. */ +#ifdef SYSCTL_DECL SYSCTL_DECL(_security); SYSCTL_DECL(_security_mac); #ifdef MAC_DEBUG SYSCTL_DECL(_security_mac_debug); SYSCTL_DECL(_security_mac_debug_counters); #endif +#endif /* SYSCTL_DECL */ /* * MAC Framework global types and typedefs. */ LIST_HEAD(mac_policy_list_head, mac_policy_conf); +#ifdef MALLOC_DECLARE MALLOC_DECLARE(M_MACTEMP); +#endif /* * MAC Framework global variables. |
