diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | conform/Makefile | 2 | ||||
| -rw-r--r-- | io/fcntl.h | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 26284bdc43..a551f7086a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2016-05-02 Joseph Myers <joseph@codesourcery.com> + + [BZ #20023] + * io/fcntl.h [__USE_XOPEN && !__USE_XOPEN2K8]: Do not include + <time.h>. + * conform/Makefile (test-xfail-UNIX98/fcntl.h/conform): Remove + variable. + (test-xfail-XOPEN2K/fcntl.h/conform): Likewise. + 2016-05-02 Adhemerval Zanella <adhemerval.zanella@linaro.org> * sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S (__clone): Fix diff --git a/conform/Makefile b/conform/Makefile index f2aa1771b6..55cada5e13 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -193,7 +193,6 @@ test-xfail-XPG4/unistd.h/conform = yes test-xfail-XPG4/utmpx.h/conform = yes test-xfail-POSIX/sys/wait.h/conform = yes test-xfail-UNIX98/arpa/inet.h/conform = yes -test-xfail-UNIX98/fcntl.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 @@ -203,7 +202,6 @@ test-xfail-UNIX98/sys/wait.h/conform = yes test-xfail-UNIX98/ucontext.h/conform = yes test-xfail-UNIX98/unistd.h/conform = yes test-xfail-UNIX98/utmpx.h/conform = yes -test-xfail-XOPEN2K/fcntl.h/conform = yes test-xfail-XOPEN2K/semaphore.h/conform = yes test-xfail-XOPEN2K/signal.h/conform = yes test-xfail-XOPEN2K/sys/wait.h/conform = yes diff --git a/io/fcntl.h b/io/fcntl.h index 1a92a8d738..cb706b4f0f 100644 --- a/io/fcntl.h +++ b/io/fcntl.h @@ -71,9 +71,11 @@ typedef __pid_t pid_t; #endif /* For XPG all symbols from <sys/stat.h> should also be available. */ -#if defined __USE_XOPEN || defined __USE_XOPEN2K8 +#ifdef __USE_XOPEN2K8 # define __need_timespec # include <time.h> +#endif +#if defined __USE_XOPEN || defined __USE_XOPEN2K8 # include <bits/stat.h> # define S_IFMT __S_IFMT |