aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <azanella@linux.vnet.ibm.com>2014-05-07 06:43:04 -0500
committerAdhemerval Zanella <azanella@linux.vnet.ibm.com>2014-05-16 15:54:30 -0500
commit026b0fe4e7a17f30281028c40ecb3e479826a9bd (patch)
tree65e83ba8921282452dcb823d810df39c42dba73f
parentfe39b021f490246b0c2d4f7035b239c77ab98aff (diff)
downloadglibc-026b0fe4e7a17f30281028c40ecb3e479826a9bd.zip
glibc-026b0fe4e7a17f30281028c40ecb3e479826a9bd.tar.gz
glibc-026b0fe4e7a17f30281028c40ecb3e479826a9bd.tar.bz2
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
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/bits/termios.h11
2 files changed, 14 insertions, 2 deletions
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 */