diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-04-28 22:01:04 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-04-28 22:01:04 +0000 |
| commit | a7657f3012765b9c2d80c7387d487fc5156d3bc2 (patch) | |
| tree | 7539c948fc051687164f87bd62388afa12316b8a /ChangeLog | |
| parent | 022d239b5d20df6c0b1ee05d527b94b671a746fb (diff) | |
| download | glibc-a7657f3012765b9c2d80c7387d487fc5156d3bc2.tar.gz glibc-a7657f3012765b9c2d80c7387d487fc5156d3bc2.tar.xz glibc-a7657f3012765b9c2d80c7387d487fc5156d3bc2.zip | |
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.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 39bb84a2b3..260bf998d8 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. |