system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some termios.h conformtest failures on sparc.

Browse Source 
* 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
This commit is contained in:
David S. Miller 2014-05-17 11:11:53 -07:00
parent f75616b2b1
commit f56c7a6ac4
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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):

19
sysdeps/unix/sysv/linux/sparc/bits/termios.h
View File

@ -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