diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | conform/Makefile | 2 | ||||
| -rw-r--r-- | libio/stdio.h | 6 |
3 files changed, 16 insertions, 5 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. diff --git a/conform/Makefile b/conform/Makefile index 06c4ff36f4..f2aa1771b6 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 712b9949e1..4511c3cc69 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. */ |