diff options
| author | William Roberts <william.c.roberts@intel.com> | 2016-09-21 16:59:27 -0700 |
|---|---|---|
| committer | Stephen Smalley <sds@tycho.nsa.gov> | 2016-09-22 13:21:39 -0400 |
| commit | d5947256faf33c7d62f201fcfb8e34d55bda8431 (patch) | |
| tree | ef9dc8b4c60203e50c3017b29ff4c46dba4ebe8a /libselinux/src | |
| parent | 7a72a8801962698ab2414d3d7c67aa33c3b573b7 (diff) | |
| download | android_external_selinux-d5947256faf33c7d62f201fcfb8e34d55bda8431.tar.gz android_external_selinux-d5947256faf33c7d62f201fcfb8e34d55bda8431.tar.bz2 android_external_selinux-d5947256faf33c7d62f201fcfb8e34d55bda8431.zip | |
Fix redefinition of XATTR_NAME_SELINUX
When the Kernel UAPI header is present, this error occurs:
external/selinux/libselinux/src/policy.h:7:9: warning: 'XATTR_NAME_SELINUX' macro redefined [-Wmacro-redefined]
\#define XATTR_NAME_SELINUX "security.selinux"
^
bionic/libc/kernel/uapi/linux/xattr.h:52:9: note: previous definition is here
\#define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
Just use the kernel UAPI version on that case.
Change-Id: I1b2d34e463477adaec227ac8c3364f1b9d49e997
Signed-off-by: William Roberts <william.c.roberts@intel.com>
Diffstat (limited to 'libselinux/src')
| -rw-r--r-- | libselinux/src/policy.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libselinux/src/policy.h b/libselinux/src/policy.h index bf270b5d..f6d72423 100644 --- a/libselinux/src/policy.h +++ b/libselinux/src/policy.h @@ -3,8 +3,13 @@ /* Private definitions used internally by libselinux. */ -/* xattr name for SELinux attributes. */ +/* + * xattr name for SELinux attributes. + * This may have been exported via Kernel uapi header. + */ +#ifndef XATTR_NAME_SELINUX #define XATTR_NAME_SELINUX "security.selinux" +#endif /* Initial length guess for getting contexts. */ #define INITCONTEXTLEN 255 |