diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-05-11 18:05:37 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-05-11 18:05:37 +0000 |
| commit | b7db76066054cbe496b4c8cea97b35d186569792 (patch) | |
| tree | 6352f5710c4a486251cae4fa60a0f8eefcaa6d04 /conform | |
| parent | 1ac3eaa6bcc473a56340c24511786ff48a91293e (diff) | |
| download | glibc-b7db76066054cbe496b4c8cea97b35d186569792.tar.gz | |
Declare tcgetsid for XPG4 (bug 20055).
termios.h should declare tcgetsid for XPG4, but only does so for
__USE_UNIX98 || __USE_XOPEN2K8 at present. This patch fixes the
declaration conditions. A spurious conformtest expectation of this
declaration for XPG3 is removed, and two XFAILs that are fixed by
these changes are also removed.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
[BZ #20055]
* termios/termios.h (pid_t): Define for [__USE_XOPEN_EXTENDED]
instead of [__USE_UNIX98].
(tcgetsid): Declare for [__USE_XOPEN_EXTENDED] instead of
[__USE_UNIX98].
* conform/data/termios.h-data (tcgetsid): Do not expect for
[XPG3].
* conform/Makefile (test-xfail-XPG3/termios.h/conform): Remove
variable.
(test-xfail-XPG4/termios.h/conform): Likewise.
Diffstat (limited to 'conform')
| -rw-r--r-- | conform/Makefile | 2 | ||||
| -rw-r--r-- | conform/data/termios.h-data | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/conform/Makefile b/conform/Makefile index 6291ca9642..d93dba042d 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -172,7 +172,6 @@ test-xfail-XPG3/signal.h/conform = yes test-xfail-XPG3/stdlib.h/conform = yes test-xfail-XPG3/string.h/conform = yes test-xfail-XPG3/sys/wait.h/conform = yes -test-xfail-XPG3/termios.h/conform = yes test-xfail-XPG3/time.h/conform = yes test-xfail-XPG3/unistd.h/conform = yes test-xfail-XPG4/arpa/inet.h/conform = yes @@ -183,7 +182,6 @@ 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/termios.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 diff --git a/conform/data/termios.h-data b/conform/data/termios.h-data index de34bf5956..778408f1b2 100644 --- a/conform/data/termios.h-data +++ b/conform/data/termios.h-data @@ -144,7 +144,7 @@ function int tcdrain (int) function int tcflow (int, int) function int tcflush (int, int) function int tcgetattr (int, struct termios*) -#ifndef POSIX +#if !defined POSIX && !defined XPG3 function pid_t tcgetsid (int) #endif function int tcsendbreak (int, int) |