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-269-ga7657f3
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Apr 2016 22:01:28 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-269-ga7657f3
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 a7657f3012765b9c2d80c7387d487fc5156d3bc2 (commit)
from 022d239b5d20df6c0b1ee05d527b94b671a746fb (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=a7657f3012765b9c2d80c7387d487fc5156d3bc2
commit a7657f3012765b9c2d80c7387d487fc5156d3bc2
Author: Joseph Myers <joseph@codesourcery.com>
Date: Thu Apr 28 22:01:04 2016 +0000
Fix stdio.h namespace for pre-threads POSIX (bug 20014).
stdio.h declares flockfile, ftrylockfile, funlockfile, getc_unlocked,
getchar_unlocked, putc_unlocked and putchar_unlocked if __USE_POSIX,
with comments "These are defined in POSIX.1:1996.". But __USE_POSIX
is actually POSIX.1:1990, and these functions should not be declared
for 1990 / 1992 / 1993 POSIX, XPG3 or XPG4. This patch fixes stdio.h
to use __USE_POSIX199506 instead for those conditionals, as that is
the correct conditional for the version of POSIX that introduced
threads, and with threads those functions.
Tested for x86_64 and x86 (testsuite, and that installed shared
libraries are unchanged by the patch).
[BZ #20014]
* libio/stdio.h (getc_unlocked): Declare if [__USE_POSIX199506],
not [__USE_POSIX].
(getchar_unlocked): Likewise.
(putc_unlocked): Likewise.
(putchar_unlocked): Likewise.
(flockfile): Likewise.
(ftrylockfile): Likewise.
(funlockfile): Likewise.
* conform/Makefile (test-xfail-XPG3/stdio.h/conform): Remove
variable.
(test-xfail-XPG4/stdio.h/conform): Likewise.
diff --git a/ChangeLog b/ChangeLog
index 39bb84a..260bf99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2016-04-28 Joseph Myers <joseph@codesourcery.com>
+ [BZ #20014]
+ * libio/stdio.h (getc_unlocked): Declare if [__USE_POSIX199506],
+ not [__USE_POSIX].
+ (getchar_unlocked): Likewise.
+ (putc_unlocked): Likewise.
+ (putchar_unlocked): Likewise.
+ (flockfile): Likewise.
+ (ftrylockfile): Likewise.
+ (funlockfile): Likewise.
+ * conform/Makefile (test-xfail-XPG3/stdio.h/conform): Remove
+ variable.
+ (test-xfail-XPG4/stdio.h/conform): Likewise.
+
* conform/data/langinfo.h-data [XPG3 || XPG4 || UNIX98] (YESSTR):
Expect constant.
[XPG3 || XPG4 || UNIX98] (NOSTR): Likewise.
diff --git a/conform/Makefile b/conform/Makefile
index 06c4ff3..f2aa177 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -169,7 +169,6 @@ test-xfail-XPG3/limits.h/conform = yes
test-xfail-XPG3/pwd.h/conform = yes
test-xfail-XPG3/search.h/conform = yes
test-xfail-XPG3/signal.h/conform = yes
-test-xfail-XPG3/stdio.h/conform = yes
test-xfail-XPG3/stdlib.h/conform = yes
test-xfail-XPG3/string.h/conform = yes
test-xfail-XPG3/sys/stat.h/conform = yes
@@ -183,7 +182,6 @@ test-xfail-XPG4/fcntl.h/conform = yes
test-xfail-XPG4/netdb.h/conform = yes
test-xfail-XPG4/netinet/in.h/conform = yes
test-xfail-XPG4/signal.h/conform = yes
-test-xfail-XPG4/stdio.h/conform = yes
test-xfail-XPG4/stdlib.h/conform = yes
test-xfail-XPG4/sys/stat.h/conform = yes
test-xfail-XPG4/sys/time.h/conform = yes
diff --git a/libio/stdio.h b/libio/stdio.h
index 712b994..4511c3c 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -544,7 +544,7 @@ __END_NAMESPACE_STD
optimization for it. */
#define getc(_fp) _IO_getc (_fp)
-#ifdef __USE_POSIX
+#ifdef __USE_POSIX199506
/* These are defined in POSIX.1:1996.
These functions are possible cancellation points and therefore not
@@ -596,7 +596,7 @@ __END_NAMESPACE_STD
extern int fputc_unlocked (int __c, FILE *__stream);
#endif /* Use MISC. */
-#ifdef __USE_POSIX
+#ifdef __USE_POSIX199506
/* These are defined in POSIX.1:1996.
These functions are possible cancellation points and therefore not
@@ -907,7 +907,7 @@ extern int obstack_vprintf (struct obstack *__restrict __obstack,
#endif /* Use GNU. */
-#ifdef __USE_POSIX
+#ifdef __USE_POSIX199506
/* These are defined in POSIX.1:1996. */
/* Acquire ownership of STREAM. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 +++++++++++++
conform/Makefile | 2 --
libio/stdio.h | 6 +++---
3 files changed, 16 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources