Also define off_t in stdio.h for UNIX98.

Similar to my previous fix for XOPEN2K
<https://sourceware.org/ml/libc-alpha/2016-04/msg00631.html>, now that
bugs in the conformtest expectations for stdio.h for UNIX98 have been
corrected, that case too fails because fseeko and ftello are now
correctly expected, but off_t is not defined.  As in that fix, it
seems appropriate to define off_t in stdio.h for this standard as
well, and this patch does so.

Tested for x86_64 and x86 (testsuite, and that installed shared
libraries are unchanged by the patch).

	* libio/stdio.h (off_t): Also define if [__USE_UNIX98].
	[__USE_LARGEFILE64] (off64_t): Likewise.
	* conform/Makefile (test-xfail-UNIX98/stdio.h/conform): Remove
	variable.

diff --git a/ChangeLog b/ChangeLog
index 896315216684c2748fca70130e33f3f7cd680a7f..715acc66ab07155f4695dd7beb7b7c933d745936 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-04-28  Joseph Myers  <joseph@codesourcery.com>
+
+       * libio/stdio.h (off_t): Also define if [__USE_UNIX98].
+       [__USE_LARGEFILE64] (off64_t): Likewise.
+       * conform/Makefile (test-xfail-UNIX98/stdio.h/conform): Remove
+       variable.
+
 2016-04-28  Florian Weimer  <fweimer@redhat.com>
 
        * inet/getnameinfo.c (getnameinfo): Do not preserve errno.

diff --git a/conform/Makefile b/conform/Makefile
index 26264fc96d6d1f599b9ce31239a18e5e8a8a8d84..7665f777812aa39b6f1e798414a7cca2d5de4225 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -202,7 +202,6 @@ test-xfail-UNIX98/langinfo.h/conform = yes
 test-xfail-UNIX98/netdb.h/conform = yes
 test-xfail-UNIX98/netinet/in.h/conform = yes
 test-xfail-UNIX98/signal.h/conform = yes
-test-xfail-UNIX98/stdio.h/conform = yes
 test-xfail-UNIX98/stdlib.h/conform = yes
 test-xfail-UNIX98/sys/time.h/conform = yes
 test-xfail-UNIX98/sys/wait.h/conform = yes

diff --git a/libio/stdio.h b/libio/stdio.h
index d7dbfad53b56bd2917e560f0dbfcc3f921e8cf93..712b9949e1ebcb3e00cbedbddb81d2643595b452 100644 (file)
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -84,7 +84,7 @@ typedef _G_va_list va_list;
 # endif
 #endif
 
-#ifdef __USE_XOPEN2K
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K
 # ifndef __off_t_defined
 # ifndef __USE_FILE_OFFSET64
 typedef __off_t off_t;