summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjonathan <jonathan@FreeBSD.org>2014-02-18 14:54:56 +0000
committerjonathan <jonathan@FreeBSD.org>2014-02-18 14:54:56 +0000
commitc8fef20aca02acfb21e34ba294d571c134ee06fc (patch)
tree2ec441527766d684d32b91543ce8a3c0bcf8c7cd
parentd61db4cf9544da0717efc8d718d42a195a86dec3 (diff)
downloadFreeBSD-src-c8fef20aca02acfb21e34ba294d571c134ee06fc.zip
FreeBSD-src-c8fef20aca02acfb21e34ba294d571c134ee06fc.tar.gz
Add more __BEGIN_DECLS / __END_DECLS to <sys/capability.h>.
capability.h currently only wraps some of its declarations in __BEGIN_DECLS/__END_DECLS, so cap_enter(), cap_sandboxed(), etc. are usable from C++ code but cap_rights_init(), cap_rights_is_valid() etc. are not. This commit fixes this distinction. Approved by: rwatson (mentor) MFC after: 1 week Sponsored by: DARPA, AFRL
-rw-r--r--sys/sys/capability.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/sys/capability.h b/sys/sys/capability.h
index aad4a15..ea25b8b 100644
--- a/sys/sys/capability.h
+++ b/sys/sys/capability.h
@@ -315,6 +315,8 @@
#define CAP_IOCTLS_ALL SSIZE_MAX
+__BEGIN_DECLS
+
#define cap_rights_init(...) \
__cap_rights_init(CAP_RIGHTS_VERSION, __VA_ARGS__, 0ULL)
cap_rights_t *__cap_rights_init(int version, cap_rights_t *rights, ...);
@@ -336,6 +338,8 @@ cap_rights_t *cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src);
cap_rights_t *cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src);
bool cap_rights_contains(const cap_rights_t *big, const cap_rights_t *little);
+__END_DECLS
+
#ifdef _KERNEL
#include <sys/systm.h>
OpenPOWER on IntegriCloud