+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.
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
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
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)
#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
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