diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-03-20 17:32:19 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-03-20 17:32:19 +0000 |
| commit | ba7fe6906d213e226dff8606dca64feb48718e27 (patch) | |
| tree | b639c8bb9810a44792a11a86c7cb5d0da550db76 | |
| parent | ddc3fb333469c2997798742dc0509dc1e3201d91 (diff) | |
| download | glibc-ba7fe6906d213e226dff8606dca64feb48718e27.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/termios.h | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -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 9deda15608..b560484b3c 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 |