This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.25-141-gba7fe69
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Mar 2017 17:32:57 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.25-141-gba7fe69
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ba7fe6906d213e226dff8606dca64feb48718e27 (commit)
from ddc3fb333469c2997798742dc0509dc1e3201d91 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ba7fe6906d213e226dff8606dca64feb48718e27
commit ba7fe6906d213e226dff8606dca64feb48718e27
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Mar 20 17:32:19 2017 +0000
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 578714c..b3ca80c 100644
--- 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 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
sysdeps/unix/sysv/linux/alpha/bits/termios.h | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources