conformtest: correct set of standards for which more headers are tested.

Continuing the corrections to which headers conformtest tests for
which standards, this patch corrects conformtest mistakes regarding
which headers to test for the remaining standards (XOPEN2K POSIX2008
XOPEN2K8).  Tested x86_64.

2014-03-05  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.

diff --git a/ChangeLog b/ChangeLog
index ce0e9a3..89b40c8 100644 (file)
--- 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 2084478..2988087 100644 (file)
--- 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 dbae045..08ae3c0 100644 (file)
--- 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 da606b8..06cea07 100644 (file)
--- 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 93e9c1e..dc2f4cb 100644 (file)
--- 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