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 084028404a76cd17cbb61eb86b165041e6d4c2b8..91e3a4669e2b2db7ac1b46637d13e1b348aa5296 100644 (file)
--- 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 de57249ec49d460e504382835fa6c9426b8998c3..b971d3c5f0ed30f70d1c0677b7a5fa642c8c35db 100644 (file)
--- 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  */