aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--conform/Makefile1
-rw-r--r--conform/data/semaphore.h-data4
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ba5a94..5bb80d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-04-28 Joseph Myers <joseph@codesourcery.com>
+
+ * conform/data/semaphore.h-data [XOPEN2K] (time.h): Allow header
+ inclusion.
+ * conform/Makefile (test-xfail-XOPEN2K/semaphore.h/conform):
+ Remove.
+
2017-04-27 Joseph Myers <joseph@codesourcery.com>
* conform/GlibcConform.pm (XPG4): Rename standard to XPG42.
diff --git a/conform/Makefile b/conform/Makefile
index 1f38b30..2039ae8 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 7c26cd3..066c2f7 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