This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-187-gfdbe8ea
- From: neleai at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Mar 2014 13:28:43 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-187-gfdbe8ea
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via fdbe8eae2b9aed74dabba1b0a189c5d7d61bf032 (commit)
from fede7a5ffa188c22c3789135bd5cf82e487dd3d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fdbe8eae2b9aed74dabba1b0a189c5d7d61bf032
commit fdbe8eae2b9aed74dabba1b0a189c5d7d61bf032
Author: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon Mar 10 23:17:07 2014 -0500
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>
diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h
index 929cd87..796df90 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. */
-----------------------------------------------------------------------
Summary of changes:
misc/sys/xattr.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources