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.23-329-g9ff8185
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 May 2016 15:50:19 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-329-g9ff8185
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 9ff81856dbbbcedb63de546d10dc1cdaeb982a6b (commit)
from b098852ac2664e7857387c2071439e1473e6e899 (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=9ff81856dbbbcedb63de546d10dc1cdaeb982a6b
commit 9ff81856dbbbcedb63de546d10dc1cdaeb982a6b
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue May 17 15:50:00 2016 +0000
Make sys/stat.h define S_IFSOCK, S_ISSOCK for XPG4 (bug 20076).
sys/stat.h should define S_IFSOCK and S_ISSOCK for XPG4 (XNS), but
does not. This patch corrects the relevant header conditionals.
Tested for x86_64 and x86 (testsuite, and that installed shared
libraries are unchanged by the patch).
[BZ #20076]
* io/sys/stat.h (S_IFSOCK): Define for [__USE_XOPEN_EXTENDED]
instead of [__USE_UNIX98].
(S_ISSOCK): Likewise.
* conform/Makefile (test-xfail-XPG4/sys/stat.h/conform): Remove
variable.
diff --git a/ChangeLog b/ChangeLog
index 7d38ded..2be1e21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2016-05-17 Joseph Myers <joseph@codesourcery.com>
+ [BZ #20076]
+ * io/sys/stat.h (S_IFSOCK): Define for [__USE_XOPEN_EXTENDED]
+ instead of [__USE_UNIX98].
+ (S_ISSOCK): Likewise.
+ * conform/Makefile (test-xfail-XPG4/sys/stat.h/conform): Remove
+ variable.
+
[BZ #20074]
* stdlib/stdlib.h (rand_r): Declare if [__USE_POSIX199506], not if
[__USE_POSIX].
diff --git a/conform/Makefile b/conform/Makefile
index 8e9ad85..f668b2e 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -174,7 +174,6 @@ test-xfail-XPG4/arpa/inet.h/conform = yes
test-xfail-XPG4/netdb.h/conform = yes
test-xfail-XPG4/netinet/in.h/conform = yes
test-xfail-XPG4/signal.h/conform = yes
-test-xfail-XPG4/sys/stat.h/conform = yes
test-xfail-XPG4/sys/wait.h/conform = yes
test-xfail-XPG4/ucontext.h/conform = yes
test-xfail-POSIX/sys/wait.h/conform = yes
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 416d564..6925f61 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -115,7 +115,7 @@ __BEGIN_DECLS
# ifdef __S_IFLNK
# define S_IFLNK __S_IFLNK
# endif
-# if (defined __USE_MISC || defined __USE_UNIX98) \
+# if (defined __USE_MISC || defined __USE_XOPEN_EXTENDED) \
&& defined __S_IFSOCK
# define S_IFSOCK __S_IFSOCK
# endif
@@ -140,7 +140,7 @@ __BEGIN_DECLS
# define S_ISLNK(mode) 0
#endif
-#if (defined __USE_UNIX98 || defined __USE_XOPEN2K) \
+#if (defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K) \
&& defined __S_IFSOCK
# define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK)
#elif defined __USE_XOPEN2K
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
conform/Makefile | 1 -
io/sys/stat.h | 4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources