This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-429-g026b0fe
- From: azanella at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 May 2014 20:55:18 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-429-g026b0fe
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 026b0fe4e7a17f30281028c40ecb3e479826a9bd (commit)
from fe39b021f490246b0c2d4f7035b239c77ab98aff (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=026b0fe4e7a17f30281028c40ecb3e479826a9bd
commit 026b0fe4e7a17f30281028c40ecb3e479826a9bd
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Wed May 7 06:43:04 2014 -0500
PowerPC: clean BSD Terminal Modes expectation in termios.h
This patch guard the BSD definition for terminal modes in PowerPC
specific header fixing the following conformance failures:
FAIL: conform/POSIX/termios.h/conform
FAIL: conform/POSIX2008/termios.h/conform
FAIL: conform/UNIX98/termios.h/conform
diff --git a/ChangeLog b/ChangeLog
index 0840284..91e3a46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-16 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
+
+ * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_MISC]: Guard
+ BSD terminal modes definitions.
+
2014-05-16 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/arm/arch-fork.h: New file.
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
index de57249..b971d3c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
@@ -95,8 +95,10 @@ struct termios {
# define NLDLY 00001400
# define NL0 00000000
# define NL1 00000400
-# define NL2 00001000
-# define NL3 00001400
+# if defined __USE_MISC
+# define NL2 00001000
+# define NL3 00001400
+# endif
# define TABDLY 00006000
# define TAB0 00000000
# define TAB1 00002000
@@ -222,6 +224,8 @@ struct termios {
#define TCSADRAIN 1
#define TCSAFLUSH 2
+#ifdef __USE_MISC
+
struct sgttyb {
char sg_ispeed;
char sg_ospeed;
@@ -257,6 +261,7 @@ struct ltchars {
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
+
struct winsize {
unsigned short ws_row;
unsigned short ws_col;
@@ -319,3 +324,5 @@ struct termio {
#define N_HDLC 13 /* synchronous HDLC */
#define N_SYNC_PPP 14 /* synchronous PPP */
#define N_HCI 15 /* Bluetooth HCI UART */
+
+#endif /* __USE_MISC */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/powerpc/bits/termios.h | 11 +++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources