diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | conform/Makefile | 2 | ||||
| -rw-r--r-- | conform/data/termios.h-data | 2 | ||||
| -rw-r--r-- | termios/termios.h | 4 |
4 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 8078217444..5609b5cdc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2016-05-11 Joseph Myers <joseph@codesourcery.com> + + [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. + 2016-05-11 Florian Weimer <fweimer@redhat.com> Do not use mcheck in localedef. 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) diff --git a/termios/termios.h b/termios/termios.h index a56bb88c75..1aef1e96eb 100644 --- a/termios/termios.h +++ b/termios/termios.h @@ -23,7 +23,7 @@ #define _TERMIOS_H 1 #include <features.h> -#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 +#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 /* We need `pid_t'. */ # include <bits/types.h> # ifndef __pid_t_defined @@ -94,7 +94,7 @@ extern int tcflush (int __fd, int __queue_selector) __THROW; extern int tcflow (int __fd, int __action) __THROW; -#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 +#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 /* Get process group ID for session leader for controlling terminal FD. */ extern __pid_t tcgetsid (int __fd) __THROW; #endif |