about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--conform/data/netinet/tcp.h-data2
-rw-r--r--conform/data/sys/timeb.h-data2
-rw-r--r--conform/data/sys/uio.h-data2
-rw-r--r--conform/data/ucontext.h-data2
5 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ce0e9a367f..89b40c8c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-03-06  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/data/netinet/tcp.h-data [POSIX2008 || XOPEN2K8]: Enable
+	whole file.
+	* conform/data/sys/timeb.h-data [POSIX2008 || XOPEN2K8]: Disable
+	whole file.
+	* conform/data/sys/uio.h-data [POSIX2008]: Likewise.
+	* conform/data/ucontext.h-data [POSIX2008 || XOPEN2K8]: Likewise.
+
 	* conform/data/aio.h-data [XPG3 || XPG4]: Disable whole file.
 	* conform/data/arpa/inet.h-data [XPG3]: Likewise.
 	* conform/data/dlfcn.h-data [XPG3 || XPG4]: Likewise.
diff --git a/conform/data/netinet/tcp.h-data b/conform/data/netinet/tcp.h-data
index 2084478d2b..298808780d 100644
--- a/conform/data/netinet/tcp.h-data
+++ b/conform/data/netinet/tcp.h-data
@@ -1,4 +1,4 @@
-#ifdef XOPEN2K
+#if defined XOPEN2K || defined POSIX2008 || defined XOPEN2K8
 macro TCP_NODELAY
 
 allow TCP_*
diff --git a/conform/data/sys/timeb.h-data b/conform/data/sys/timeb.h-data
index dbae045bd5..08ae3c0932 100644
--- a/conform/data/sys/timeb.h-data
+++ b/conform/data/sys/timeb.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined POSIX2008 && !defined XOPEN2K8
 type {struct timeb}
 
 element {struct timeb} time_t time
diff --git a/conform/data/sys/uio.h-data b/conform/data/sys/uio.h-data
index da606b8f3f..06cea074cd 100644
--- a/conform/data/sys/uio.h-data
+++ b/conform/data/sys/uio.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined POSIX2008
 type {struct iovec}
 
 element {struct iovec} {void*} iov_base
diff --git a/conform/data/ucontext.h-data b/conform/data/ucontext.h-data
index 93e9c1ed51..dc2f4cb0da 100644
--- a/conform/data/ucontext.h-data
+++ b/conform/data/ucontext.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined POSIX2008 && !defined XOPEN2K8
 type mcontext_t
 
 type ucontext_t