diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-05-17 15:50:00 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-05-17 15:50:00 +0000 |
| commit | 9ff81856dbbbcedb63de546d10dc1cdaeb982a6b (patch) | |
| tree | 005d752183dda226c337decdeb5f2ee2ab5c3e39 | |
| parent | b098852ac2664e7857387c2071439e1473e6e899 (diff) | |
| download | glibc-9ff81856dbbbcedb63de546d10dc1cdaeb982a6b.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | conform/Makefile | 1 | ||||
| -rw-r--r-- | io/sys/stat.h | 4 |
3 files changed, 9 insertions, 3 deletions
@@ -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 8e9ad85772..f668b2e19a 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 416d5647d4..6925f61ae5 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 |