]> git.ipfire.org Git - thirdparty/glibc.git/commit
Correct ttyslot header declaration conditions (bug 20051).
authorJoseph Myers <joseph@codesourcery.com>
Tue, 17 May 2016 15:47:20 +0000 (15:47 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Tue, 17 May 2016 15:47:20 +0000 (15:47 +0000)
commit4242d9683fef6e618b80ec939adc37ff25cd2d79
tree7f4758ea048ed8417be3da45f1e1ce02b307ab7c
parentb3a810d0d3d5c6ce7ddfb61321cd7971808ca703
Correct ttyslot header declaration conditions (bug 20051).

UNIX98 and XPG4 have ttyslot in <stdlib.h>.  glibc, however, has it in
<unistd.h>, for __USE_MISC || (__USE_XOPEN_EXTENDED && !__USE_UNIX98),
but no supported standard has it in <unistd.h>.

This patch adds a properly conditioned declaration to <stdlib.h> (only
enabled for the relevant standards, not for __USE_MISC or __USE_GNU).
The <unistd.h> 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.
ChangeLog
conform/Makefile
posix/unistd.h
stdlib/stdlib.h