diff options
| author | Serge Hallyn <serge.hallyn@ubuntu.com> | 2014-03-10 23:17:07 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-05-04 14:17:57 +1000 |
| commit | 5ed20724012043e91683bcd5fcea197f59ae4120 (patch) | |
| tree | 888d146ce67ed2590cdd12359f007058a50b6e1f | |
| parent | 526fbebbbe7ceaf16230fe7a7ebf37c8849a835e (diff) | |
| download | glibc-5ed20724012043e91683bcd5fcea197f59ae4120.tar glibc-5ed20724012043e91683bcd5fcea197f59ae4120.tar.gz glibc-5ed20724012043e91683bcd5fcea197f59ae4120.tar.bz2 glibc-5ed20724012043e91683bcd5fcea197f59ae4120.zip | |
misc/sys/xattr.h: guard against linux uapi header inclusion
If the glibc xattr.h header is included after the uapi header,
compilation fails due to an enum re-using a #define from the
uapi header. Protect against this by guarding the define and
enum inclusions against each other.
(A corresponding kernel patch has been sent here:
http://lkml.org/lkml/2014/3/7/331 )
(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
and https://sourceware.org/glibc/wiki/Synchronizing_Headers
for more information.)
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
(cherry picked from commit fdbe8eae2b9aed74dabba1b0a189c5d7d61bf032)
| -rw-r--r-- | misc/sys/xattr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h index 929cd87639..796df90605 100644 --- a/misc/sys/xattr.h +++ b/misc/sys/xattr.h @@ -26,6 +26,7 @@ __BEGIN_DECLS /* The following constants should be used for the fifth parameter of `*setxattr'. */ +#ifndef __USE_KERNEL_XATTR_DEFS enum { XATTR_CREATE = 1, /* set value, fail if attr already exists. */ @@ -33,6 +34,7 @@ enum XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */ #define XATTR_REPLACE XATTR_REPLACE }; +#endif /* Set the attribute NAME of the file pointed to by PATH to VALUE (which is SIZE bytes long). Return 0 on success, -1 for errors. */ |