diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | conform/Makefile | 4 | ||||
| -rw-r--r-- | misc/sys/select.h | 4 |
3 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,14 @@ +2016-05-03 Joseph Myers <joseph@codesourcery.com> + + [BZ #20041] + * misc/sys/select.h (__need_timespec): Only define if + [__USE_XOPEN2K]. + * conform/Makefile (test-xfail-XPG4/sys/time.h/conform): Remove + variable. + (test-xfail-XPG4/utmpx.h/conform): Likewise. + (test-xfail-UNIX98/sys/time.h/conform): Likewise. + (test-xfail-UNIX98/utmpx.h/conform): Likewise. + 2016-05-03 Paul E. Murphy <murphyp@linux.vnet.ibm.com> Segher Boessenkool <segher@gcc.gnu.org> diff --git a/conform/Makefile b/conform/Makefile index 55cada5e13..d5273c1743 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -184,24 +184,20 @@ test-xfail-XPG4/netinet/in.h/conform = yes test-xfail-XPG4/signal.h/conform = yes test-xfail-XPG4/stdlib.h/conform = yes test-xfail-XPG4/sys/stat.h/conform = yes -test-xfail-XPG4/sys/time.h/conform = yes test-xfail-XPG4/sys/types.h/conform = yes test-xfail-XPG4/sys/wait.h/conform = yes test-xfail-XPG4/termios.h/conform = yes test-xfail-XPG4/ucontext.h/conform = yes 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/netdb.h/conform = yes test-xfail-UNIX98/netinet/in.h/conform = yes test-xfail-UNIX98/signal.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 test-xfail-UNIX98/ucontext.h/conform = yes test-xfail-UNIX98/unistd.h/conform = yes -test-xfail-UNIX98/utmpx.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/misc/sys/select.h b/misc/sys/select.h index b852dac2d8..52dd94fe01 100644 --- a/misc/sys/select.h +++ b/misc/sys/select.h @@ -39,7 +39,9 @@ typedef __sigset_t sigset_t; /* Get definition of timer specification structures. */ #define __need_time_t -#define __need_timespec +#ifdef __USE_XOPEN2K +# define __need_timespec +#endif #include <time.h> #define __need_timeval #include <bits/time.h> |