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.23-165-geb64b6d
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Apr 2016 22:53:11 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-165-geb64b6d
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 eb64b6d4571caea5fe39f6427565f849b09c23b6 (commit)
from ed80f206f42906ec7d2634595fb5ef8338c7c943 (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=eb64b6d4571caea5fe39f6427565f849b09c23b6
commit eb64b6d4571caea5fe39f6427565f849b09c23b6
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Apr 8 22:52:51 2016 +0000
Fix limits.h NL_NMAX namespace (bug 19929).
bits/xopen_lim.h (included by limits.h if __USE_XOPEN) defines
NL_NMAX, but this constant was removed in the 2008 edition of POSIX so
should not be defined in that case. This patch duly disables that
define for __USE_XOPEN2K8. It remains enabled for __USE_GNU to avoid
affecting sysconf (_SC_NL_NMAX), the implementation of which uses
"#ifdef NL_NMAX".
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
[BZ #19929]
* include/bits/xopen_lim.h (NL_NMAX): Do not define if
[__USE_XOPEN2K8 && !__USE_GNU].
* conform/Makefile (test-xfail-XOPEN2K8/limits.h/conform): Remove
variable.
diff --git a/ChangeLog b/ChangeLog
index 61562e2..541d189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2016-04-08 Joseph Myers <joseph@codesourcery.com>
+ [BZ #19929]
+ * include/bits/xopen_lim.h (NL_NMAX): Do not define if
+ [__USE_XOPEN2K8 && !__USE_GNU].
+ * conform/Makefile (test-xfail-XOPEN2K8/limits.h/conform): Remove
+ variable.
+
[BZ #19925]
* sysdeps/unix/sysv/linux/alpha/bits/termios.h (XCASE): Do not
define if [!__USE_MISC && __USE_XOPEN2K].
diff --git a/conform/Makefile b/conform/Makefile
index ed94ffc..0b5514c 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -225,7 +225,6 @@ test-xfail-POSIX2008/netinet/in.h/conform = yes
test-xfail-POSIX2008/signal.h/conform = yes
test-xfail-POSIX2008/sys/socket.h/conform = yes
test-xfail-POSIX2008/sys/wait.h/conform = yes
-test-xfail-XOPEN2K8/limits.h/conform = yes
test-xfail-XOPEN2K8/signal.h/conform = yes
test-xfail-XOPEN2K8/stdio.h/conform = yes
test-xfail-XOPEN2K8/sys/wait.h/conform = yes
diff --git a/include/bits/xopen_lim.h b/include/bits/xopen_lim.h
index 26b4fba..7515ddd 100644
--- a/include/bits/xopen_lim.h
+++ b/include/bits/xopen_lim.h
@@ -77,7 +77,9 @@
/* Maximum number of bytes in N-to-1 collation mapping. We have no
limit. */
-#define NL_NMAX INT_MAX
+#if defined __USE_GNU || !defined __USE_XOPEN2K8
+# define NL_NMAX INT_MAX
+#endif
/* Maximum set number. We have no limit. */
#define NL_SETMAX INT_MAX
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
conform/Makefile | 1 -
include/bits/xopen_lim.h | 4 +++-
3 files changed, 9 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources