This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.23-312-gb7db760


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  b7db76066054cbe496b4c8cea97b35d186569792 (commit)
      from  1ac3eaa6bcc473a56340c24511786ff48a91293e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b7db76066054cbe496b4c8cea97b35d186569792

commit b7db76066054cbe496b4c8cea97b35d186569792
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed May 11 18:05:37 2016 +0000

    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.

diff --git a/ChangeLog b/ChangeLog
index 8078217..5609b5c 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 6291ca9..d93dba0 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 de34bf5..778408f 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 a56bb88..1aef1e9 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

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                   |   13 +++++++++++++
 conform/Makefile            |    2 --
 conform/data/termios.h-data |    2 +-
 termios/termios.h           |    4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]