diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | conform/data/stdio.h-data | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 91061fb4cc..0685aa0f1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2016-04-27 Joseph Myers <joseph@codesourcery.com> + + * conform/data/stdio.h-data (flockfile): Also expect for [UNIX98]. + (fseeko): Likewise. + (ftello): Likewise. + (ftrylockfile): Likewise. + (funlockfile): Likewise. + (getc_unlocked): Likewise. + (getchar_unlocked): Likewise. + (putc_unlocked): Likewise. + (putchar_unlocked): Likewise. + 2016-03-25 Florian Weimer <fweimer@redhat.com> [BZ #19868] diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data index 9089180a10..2f382253f4 100644 --- a/conform/data/stdio.h-data +++ b/conform/data/stdio.h-data @@ -72,7 +72,7 @@ function {char*} fgets (char*, int, FILE*) #if !defined ISO && !defined ISO99 && !defined ISO11 function int fileno (FILE*) #endif -#if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function void flockfile (FILE*) #endif #if defined XOPEN2K8 || defined POSIX2008 @@ -86,22 +86,22 @@ function size_t fread (void*, size_t, size_t, FILE*) function {FILE*} freopen (const char*, const char*, FILE*) function int fscanf (FILE*, const char*, ...) function int fseek (FILE*, long int, int) -#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function int fseeko (FILE*, off_t, int) #endif function int fsetpos (FILE*, const fpos_t*) function {long int} ftell (FILE*) -#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function off_t ftello (FILE*) #endif -#if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function int ftrylockfile (FILE*) function void funlockfile (FILE*) #endif function size_t fwrite (const void*, size_t, size_t, FILE*) function int getc (FILE*) function int getchar (void) -#if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function int getc_unlocked (FILE*) function int getchar_unlocked (void) #endif @@ -131,7 +131,7 @@ function {FILE*} popen (const char*, const char*) function int printf (const char*, ...) function int putc (int, FILE*) function int putchar (int) -#if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function int putc_unlocked (int, FILE*) function int putchar_unlocked (int) #endif |