diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-04-27 21:17:00 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-04-27 21:17:00 +0000 |
| commit | 1876dfe4c362c8cd96361aaf5fdc6ef29e36ec2d (patch) | |
| tree | 4f5126218ca7a93c33f8199c7ab57244f0a9fe4d | |
| parent | a12f9431b3808e78b9ed397e4fce7de69410d94d (diff) | |
| download | glibc-1876dfe4c362c8cd96361aaf5fdc6ef29e36ec2d.zip glibc-1876dfe4c362c8cd96361aaf5fdc6ef29e36ec2d.tar.gz glibc-1876dfe4c362c8cd96361aaf5fdc6ef29e36ec2d.tar.bz2 | |
conformtest: Correct some stdio.h expectations for UNIX98.
The conform/ test of stdio.h for UNIX98 fails with surious namespace
errors for functions that are correctly declared for that standard.
This patch fixes the expectations to expect those functions also for
UNIX98. (This does not by itself fix the XFAIL of that test, and is
not based a full review of the header expectations so there could
still be other bugs in the expectations for this header for UNIX98.)
Tested for x86_64 and x86.
* 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.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | conform/data/stdio.h-data | 12 |
2 files changed, 18 insertions, 6 deletions
@@ -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 9089180..2f38225 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 |