Fix alpha termios.h NL2, NL3 namespace (bug 21268)

Submitted by Joseph S. Myers on March 18, 2017, 12:34 a.m.

Details

Message ID alpine.DEB.2.20.1703180034320.9823@digraph.polyomino.org.uk
State New
Headers show

Commit Message

Joseph S. Myers March 18, 2017, 12:34 a.m.
sysdeps/unix/sysv/linux/alpha/bits/termios.h defines NL2 and NL3 for
__USE_MISC || __USE_XOPEN.  These should only be defined for
__USE_MISC as they are not part of any standard namespace.  This patch
conditions them accordingly, matching the powerpc version of the
header (the only other one in glibc that defines these macros).

Tested (compilation only) with build-many-glibcs.py.

2017-03-18  Joseph Myers  <joseph@codesourcery.com>

	[BZ #21268]
	* sysdeps/unix/sysv/linux/alpha/bits/termios.h (NL2): Define only
	if [__USE_MISC]
	(NL3): Likewise.

Comments

Mike Frysinger March 20, 2017, 9:09 a.m.
On 18 Mar 2017 00:34, Joseph Myers wrote:
> sysdeps/unix/sysv/linux/alpha/bits/termios.h defines NL2 and NL3 for
> __USE_MISC || __USE_XOPEN.  These should only be defined for
> __USE_MISC as they are not part of any standard namespace.  This patch
> conditions them accordingly, matching the powerpc version of the
> header (the only other one in glibc that defines these macros).
> 
> Tested (compilation only) with build-many-glibcs.py.

lgtm
-mike

Patch hide | download patch | download mbox

diff --git a/sysdeps/unix/sysv/linux/alpha/bits/termios.h b/sysdeps/unix/sysv/linux/alpha/bits/termios.h
index 9deda15..b560484 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/termios.h
@@ -93,8 +93,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