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.

diff --git a/ChangeLog b/ChangeLog
index 91061fb4cca1a1f36bb389ddb78676adffd6b071..0685aa0f1f64159e43153d8b715f36aa68a9e514 100644 (file)
--- 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 9089180a1080aa54d45ea84452195848ac4cdefe..2f382253f4685a0b7f7e974339753f51ae0338a1 100644 (file)
--- 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