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. --- stdlib/stdlib.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'stdlib') diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index d0c78facdd..5c0c982ccf 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -912,6 +912,12 @@ extern int getloadavg (double __loadavg[], int __nelem) __THROW __nonnull ((1)); #endif +#if defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K +/* Return the index into the active-logins file (utmp) for + the controlling terminal. */ +extern int ttyslot (void) __THROW; +#endif + #include /* Define some macros helping to catch buffer overflows. */ -- cgit v1.2.3