GNU C Library master sources branch master updated. glibc-2.19-433-gf56c7a6

[davem at sourceware dot org]

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  f56c7a6ac411174de3556d1a8a4c2a33bd09869b (commit)
      from  f75616b2b1095cf17c3330f33f4bcfcc8fc2fdcd (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=f56c7a6ac411174de3556d1a8a4c2a33bd09869b

commit f56c7a6ac411174de3556d1a8a4c2a33bd09869b
Author: David S. Miller <davem@davemloft.net>
Date:   Sat May 17 11:11:53 2014 -0700

    Fix some termios.h conformtest failures on sparc.
    
    	* sysdeps/unix/sysv/linux/sparc/bits/termios.h (PAGEOUT, WRAP):
    	Protect with __USE_GNU.
    	(TIOCSET_TEMPT): Likewise.
    	(TIOCM_LE, TIOCM_DTR, TIOCM_RTS, TIOCM_ST, TIOCM_SR, TIOCM_CTS,
    	TIOCM_CAR, TIOCM_RNG, TIOCM_DSR, TIOCM_CD, TIOCM_RI): Remove as
    	these are already provided in bits/ioctl-types.h

diff --git a/ChangeLog b/ChangeLog
index 13118b4..c16e823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-05-17  David S. Miller  <davem@davemloft.net>
+
+	* sysdeps/unix/sysv/linux/sparc/bits/termios.h (PAGEOUT, WRAP):
+	Protect with __USE_GNU.
+	(TIOCSET_TEMPT): Likewise.
+	(TIOCM_LE, TIOCM_DTR, TIOCM_RTS, TIOCM_ST, TIOCM_SR, TIOCM_CTS,
+	TIOCM_CAR, TIOCM_RNG, TIOCM_DSR, TIOCM_CD, TIOCM_RI): Remove as
+	these are already provided in bits/ioctl-types.h
+
 2014-05-16  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel):
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/termios.h b/sysdeps/unix/sysv/linux/sparc/bits/termios.h
index 94524b3..b7a103b 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/termios.h
@@ -107,8 +107,11 @@ struct termios
 #define VTDLY	0x00004000
 #define   VT0	0x00000000
 #define   VT1	0x00004000
+
+# if defined __USE_GNU
 #define PAGEOUT 0x00010000	/* SUNOS specific */
 #define WRAP    0x00020000	/* SUNOS specific */
+# endif
 
 #ifdef __USE_MISC
 # define   XTABS	0x00001800
@@ -200,22 +203,10 @@ struct termios
 # define EXTPROC 0x00010000
 #endif
 
-/* modem lines */
-#define TIOCM_LE	0x001
-#define TIOCM_DTR	0x002
-#define TIOCM_RTS	0x004
-#define TIOCM_ST	0x008
-#define TIOCM_SR	0x010
-#define TIOCM_CTS	0x020
-#define TIOCM_CAR	0x040
-#define TIOCM_RNG	0x080
-#define TIOCM_DSR	0x100
-#define TIOCM_CD	TIOCM_CAR
-#define TIOCM_RI	TIOCM_RNG
-
+# if defined __USE_GNU
 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
 #define TIOCSER_TEMT    0x01	/* Transmitter physically empty */
-
+#endif
 
 /* tcflow() and TCXONC use these */
 #define	TCOOFF		0

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

Summary of changes:
 ChangeLog                                    |    9 +++++++++
 sysdeps/unix/sysv/linux/sparc/bits/termios.h |   19 +++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)


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