GNU C Library master sources branch master updated. glibc-2.23-267-g10b8108

[jsm28 at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  10b8108aec36d8a2bff577c8b1d45ab9fe3bba87 (commit)
      from  2b54cbce2c363ab6ae89d10657d7465858116d7a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=10b8108aec36d8a2bff577c8b1d45ab9fe3bba87

commit 10b8108aec36d8a2bff577c8b1d45ab9fe3bba87
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Thu Apr 28 17:00:52 2016 +0000

    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 8963152..715acc6 100644
--- 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 26264fc..7665f77 100644
--- 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 d7dbfad..712b994 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;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    7 +++++++
 conform/Makefile |    1 -
 libio/stdio.h    |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources