From 4242d9683fef6e618b80ec939adc37ff25cd2d79 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 17 May 2016 15:47:20 +0000 Subject: Correct ttyslot header declaration conditions (bug 20051). UNIX98 and XPG4 have ttyslot in . glibc, however, has it in , for __USE_MISC || (__USE_XOPEN_EXTENDED && !__USE_UNIX98), but no supported standard has it in . This patch adds a properly conditioned declaration to (only enabled for the relevant standards, not for __USE_MISC or __USE_GNU). The declaration is restricted to __USE_MISC. Some relevant XFAILs are removed. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #20051] * posix/unistd.h [__USE_XOPEN_EXTENDED && !__USE_UNIX98] (ttyslot): Do not declare. * stdlib/stdlib.h [__USE_XOPEN_EXTENDED && !__USE_XOPEN2K] (ttyslot): New prototype. * conform/Makefile (test-xfail-XPG4/unistd.h/conform): Remove variable. (test-xfail-UNIX98/stdlib.h/conform): Likewise. --- conform/Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'conform/Makefile') diff --git a/conform/Makefile b/conform/Makefile index 0d610ad..ab9da78 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -178,13 +178,11 @@ 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 test-xfail-POSIX/sys/wait.h/conform = yes test-xfail-UNIX98/arpa/inet.h/conform = yes test-xfail-UNIX98/netdb.h/conform = yes test-xfail-UNIX98/netinet/in.h/conform = yes test-xfail-UNIX98/signal.h/conform = yes -test-xfail-UNIX98/stdlib.h/conform = yes test-xfail-UNIX98/sys/wait.h/conform = yes test-xfail-UNIX98/ucontext.h/conform = yes test-xfail-XOPEN2K/semaphore.h/conform = yes -- cgit v1.1