diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-04-28 16:52:16 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-04-28 16:52:16 +0000 |
| commit | 085e07db22e5bb6c898cd686c0ae3e7cd4ab17f2 (patch) | |
| tree | 3bf07cad51c42eeb89c819c99c8511d962e17ce7 /conform | |
| parent | 0516e24d1882ee7f1946b53bec360b400548cb4f (diff) | |
conformtest: Allow time.h inclusion from semaphore.h for XOPEN2K.
POSIX.1:2001 added sem_timedwait, but said nothing about defining
struct timespec in semaphore.h. The 2008 edition added a
corresponding permission to include <time.h> from <semaphore.h>.
Since this is the normal POSIX approach in such cases, it seems
appropriate to consider this a bug fix, and so this patch makes the
conform/ tests allow that inclusion for POSIX.1:2001 as well.
Tested for x86_64.
* conform/data/semaphore.h-data [XOPEN2K] (time.h): Allow header
inclusion.
* conform/Makefile (test-xfail-XOPEN2K/semaphore.h/conform):
Remove.
Diffstat (limited to 'conform')
| -rw-r--r-- | conform/Makefile | 1 | ||||
| -rw-r--r-- | conform/data/semaphore.h-data | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conform/Makefile b/conform/Makefile index 1f38b306ae..2039ae8df7 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -176,7 +176,6 @@ test-xfail-UNIX98/netinet/in.h/conform = yes test-xfail-UNIX98/signal.h/conform = yes test-xfail-UNIX98/sys/wait.h/conform = yes test-xfail-UNIX98/ucontext.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 test-xfail-XOPEN2K/ucontext.h/conform = yes diff --git a/conform/data/semaphore.h-data b/conform/data/semaphore.h-data index 7c26cd3fd6..066c2f721b 100644 --- a/conform/data/semaphore.h-data +++ b/conform/data/semaphore.h-data @@ -20,7 +20,9 @@ allow-header fcntl.h # if !defined POSIX2008 && !defined XOPEN2K8 allow-header sys/types.h # endif -# if !defined POSIX && !defined UNIX98 && !defined XOPEN2K +// Consider addition of this permission in POSIX.1:2008 as a bug fix, +// so allow for POSIX.1:2001 as well since that includes sem_timedwait. +# if !defined POSIX && !defined UNIX98 allow-header time.h # endif |