AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declare tcgetsid for XPG4 (bug 20055).

Browse Source 
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.
This commit is contained in:
Joseph Myers 2016-05-11 18:05:37 +00:00
parent 1ac3eaa6bc
commit b7db760660
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -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> 2016-05-11 Florian Weimer <fweimer@redhat.com>
Do not use mcheck in localedef. Do not use mcheck in localedef.

2
conform/Makefile
View File

@ -172,7 +172,6 @@ test-xfail-XPG3/signal.h/conform = yes
test-xfail-XPG3/stdlib.h/conform = yes test-xfail-XPG3/stdlib.h/conform = yes
test-xfail-XPG3/string.h/conform = yes test-xfail-XPG3/string.h/conform = yes
test-xfail-XPG3/sys/wait.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/time.h/conform = yes
test-xfail-XPG3/unistd.h/conform = yes test-xfail-XPG3/unistd.h/conform = yes
test-xfail-XPG4/arpa/inet.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/stdlib.h/conform = yes
test-xfail-XPG4/sys/stat.h/conform = yes test-xfail-XPG4/sys/stat.h/conform = yes
test-xfail-XPG4/sys/wait.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/ucontext.h/conform = yes
test-xfail-XPG4/unistd.h/conform = yes test-xfail-XPG4/unistd.h/conform = yes
test-xfail-POSIX/sys/wait.h/conform = yes test-xfail-POSIX/sys/wait.h/conform = yes

2
conform/data/termios.h-data
View File

@ -144,7 +144,7 @@ function int tcdrain (int)
function int tcflow (int, int) function int tcflow (int, int)
function int tcflush (int, int) function int tcflush (int, int)
function int tcgetattr (int, struct termios*) function int tcgetattr (int, struct termios*)
#ifndef POSIX #if !defined POSIX && !defined XPG3
function pid_t tcgetsid (int) function pid_t tcgetsid (int)
#endif #endif
function int tcsendbreak (int, int) function int tcsendbreak (int, int)

4
termios/termios.h
View File

@ -23,7 +23,7 @@
#define _TERMIOS_H 1 #define _TERMIOS_H 1
#include <features.h> #include <features.h>
#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 #if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
/* We need `pid_t'. */ /* We need `pid_t'. */
# include <bits/types.h> # include <bits/types.h>
# ifndef __pid_t_defined # 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; 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. */ /* Get process group ID for session leader for controlling terminal FD. */
extern __pid_t tcgetsid (int __fd) __THROW; extern __pid_t tcgetsid (int __fd) __THROW;
#endif #endif