about summary refs log tree commit diff
path: root/libio
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-04-28 17:00:52 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-04-28 17:00:52 +0000
commit10b8108aec36d8a2bff577c8b1d45ab9fe3bba87 (patch)
tree2cf5393f93f08dbc178bfc6e78cfcc25a38d9b08 /libio
parent2b54cbce2c363ab6ae89d10657d7465858116d7a (diff)
downloadglibc-10b8108aec36d8a2bff577c8b1d45ab9fe3bba87.tar.gz
glibc-10b8108aec36d8a2bff577c8b1d45ab9fe3bba87.tar.xz
glibc-10b8108aec36d8a2bff577c8b1d45ab9fe3bba87.zip
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.
Diffstat (limited to 'libio')
-rw-r--r--libio/stdio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libio/stdio.h b/libio/stdio.h
index d7dbfad53b..712b9949e1 100644
--- 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;