summary refs log tree commit diff
path: root/termios
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-05-11 18:05:37 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-05-11 18:05:37 +0000
commitb7db76066054cbe496b4c8cea97b35d186569792 (patch)
tree6352f5710c4a486251cae4fa60a0f8eefcaa6d04 /termios
parent1ac3eaa6bcc473a56340c24511786ff48a91293e (diff)
downloadglibc-b7db76066054cbe496b4c8cea97b35d186569792.tar.gz
glibc-b7db76066054cbe496b4c8cea97b35d186569792.tar.xz
glibc-b7db76066054cbe496b4c8cea97b35d186569792.zip
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 'termios')
-rw-r--r--termios/termios.h4
1 files changed, 2 insertions, 2 deletions
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