This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Make sys/stat.h define S_IFSOCK, S_ISSOCK for XPG4 (bug 20076)
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Wed, 11 May 2016 23:27:20 +0000
- Subject: Make sys/stat.h define S_IFSOCK, S_ISSOCK for XPG4 (bug 20076)
- Authentication-results: sourceware.org; auth=none
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).
2016-05-11 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.
diff --git a/conform/Makefile b/conform/Makefile
index d93dba0..dcc2965 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -180,7 +180,6 @@ 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/stdlib.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-XPG4/unistd.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
--
Joseph S. Myers
joseph@codesourcery.com