diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | conform/Makefile | 1 | ||||
| -rw-r--r-- | libio/stdio.h | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 5c40ad8035..8cbc1b1a2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2016-04-26 Joseph Myers <joseph@codesourcery.com> + + * libio/stdio.h (off_t): Define if [__USE_XOPEN2K], not + [__USE_XOPEN2K8]. + [__USE_LARGEFILE64] (off64_t): Likewise. + * conform/Makefile (test-xfail-XOPEN2K/stdio.h/conform): Remove + variable. + 2016-04-25 Joseph Myers <joseph@codesourcery.com> [BZ #19989] diff --git a/conform/Makefile b/conform/Makefile index e3baec7c9f..7af4b2fee8 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -216,7 +216,6 @@ test-xfail-XOPEN2K/mqueue.h/conform = yes test-xfail-XOPEN2K/semaphore.h/conform = yes test-xfail-XOPEN2K/signal.h/conform = yes test-xfail-XOPEN2K/stdarg.h/conform = yes -test-xfail-XOPEN2K/stdio.h/conform = yes test-xfail-XOPEN2K/sys/wait.h/conform = yes test-xfail-XOPEN2K/ucontext.h/conform = yes test-xfail-POSIX2008/arpa/inet.h/conform = yes diff --git a/libio/stdio.h b/libio/stdio.h index 4b66530460..d7dbfad53b 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -84,7 +84,7 @@ typedef _G_va_list va_list; # endif #endif -#ifdef __USE_XOPEN2K8 +#ifdef __USE_XOPEN2K # ifndef __off_t_defined # ifndef __USE_FILE_OFFSET64 typedef __off_t off_t; @@ -97,7 +97,9 @@ typedef __off64_t off_t; typedef __off64_t off64_t; # define __off64_t_defined # endif +#endif +#ifdef __USE_XOPEN2K8 # ifndef __ssize_t_defined typedef __ssize_t ssize_t; # define __ssize_t_defined |