Patchwork alpha: fix visibility issues in termios.h

login
register
mail settings
Submitter Aurelien Jarno
Date Dec. 7, 2015, 8:30 p.m.
Message ID <1449520216-7354-1-git-send-email-aurelien@aurel32.net>
Download mbox | patch
Permalink /patch/9926/
State New
Delegated to: Richard Henderson
Headers show

Comments

Aurelien Jarno - Dec. 7, 2015, 8:30 p.m.
Fix IXANY, IUCLC, IMAXBEL, IUTF8 visibility for alpha. This was missed
14 years ago when the same change has been done for other architectures.

Fix NL2, NL3 visibility for alpha.

This fixes the following conformance failures:

FAIL: conform/POSIX2008/termios.h/conform
FAIL: conform/UNIX98/termios.h/conform

---
 ChangeLog                                    |  6 ++++++
 sysdeps/unix/sysv/linux/alpha/bits/termios.h | 17 ++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)
Mike Frysinger - Dec. 29, 2015, 5:54 p.m.
On 07 Dec 2015 21:30, Aurelien Jarno wrote:
> Fix IXANY, IUCLC, IMAXBEL, IUTF8 visibility for alpha. This was missed
> 14 years ago when the same change has been done for other architectures.
> 
> Fix NL2, NL3 visibility for alpha.
> 
> This fixes the following conformance failures:
> 
> FAIL: conform/POSIX2008/termios.h/conform
> FAIL: conform/UNIX98/termios.h/conform

looks fine to me
-mike

Patch

diff --git a/ChangeLog b/ChangeLog
index 379ba75..7be1eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@ 
+2015-12-07  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/unix/sysv/linux/alpha/bits/termios.h (IXANY, IUCLC,
+	IMAXBEL, IUTF8): Make always visible since they're needed by POSIX.
+	(NL2, NL3): Guard BSD terminal modes definitions with [__USE_MISC].
+
 2015-12-04  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix typo in strncat, wcsncat manual entries
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/termios.h b/sysdeps/unix/sysv/linux/alpha/bits/termios.h
index b862fb4..45eea17 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/termios.h
@@ -70,13 +70,10 @@  struct termios
 #define ICRNL	0000400
 #define IXON	0001000
 #define IXOFF	0002000
-#ifdef __USE_MISC
-  /* POSIX.1 doesn't want these... */
-# define IXANY		0004000
-# define IUCLC		0010000
-# define IMAXBEL	0020000
-# define IUTF8		0040000
-#endif
+#define IXANY	0004000
+#define IUCLC	0010000
+#define IMAXBEL	0020000
+#define IUTF8	0040000
 
 /* c_oflag bits */
 #define OPOST	0000001
@@ -93,8 +90,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