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

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.

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

diff --git a/ChangeLog b/ChangeLog
index 578714c4fba73257f95fa254c328c8de90d8a58e..b3ca80cc124fd9bf5537d816f04bf68c90777fbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-20  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #21268]
+       * sysdeps/unix/sysv/linux/alpha/bits/termios.h (NL2): Define only
+       if [__USE_MISC]
+       (NL3): Likewise.
+
 2017-03-20  Mike Frysinger  <vapier@gentoo.org>
 
        [BZ #21275]

diff --git a/sysdeps/unix/sysv/linux/alpha/bits/termios.h b/sysdeps/unix/sysv/linux/alpha/bits/termios.h
index 9deda15608ad5f13b0bea3e51b529a962a248832..b560484b3c029f0e7fef341d531e87b37d2e1b4e 100644 (file)
--- 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