conformtest: Remove some bogus sys/types.h expectations for XPG3 and XPG4 [committed]

[Joseph Myers]

The conformtest tests for sys/types.h for XPG3 and XPG4 fail because
of missing blksize_t.  This is a bug in the expectations; that type is
not part of those standards.  This patch stops the tests from
expecting it, and some other types that also are not part of XPG3 and
XPG4.

Tested for x86_64 and x86.  Committed.

2016-05-09  Joseph Myers  <joseph@codesourcery.com>

	* conform/data/sys/types.h-data (blkcnt_t): Do not expect for
	[XPG3 || XPG4].
	(blksize_t): Likewise.
	(clockid_t): Likewise.
	* conform/Makefile (test-xfail-XPG3/sys/types.h/conform): Remove
	variable.
	(test-xfail-XPG4/sys/types.h/conform): Likewise.

diff --git a/conform/Makefile b/conform/Makefile
index d5273c1..32714e7 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -172,7 +172,6 @@ test-xfail-XPG3/signal.h/conform = yes
 test-xfail-XPG3/stdlib.h/conform = yes
 test-xfail-XPG3/string.h/conform = yes
 test-xfail-XPG3/sys/stat.h/conform = yes
-test-xfail-XPG3/sys/types.h/conform = yes
 test-xfail-XPG3/sys/wait.h/conform = yes
 test-xfail-XPG3/termios.h/conform = yes
 test-xfail-XPG3/time.h/conform = yes
@@ -184,7 +183,6 @@ 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/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
diff --git a/conform/data/sys/types.h-data b/conform/data/sys/types.h-data
index 36c5efa..496ebf4 100644
--- a/conform/data/sys/types.h-data
+++ b/conform/data/sys/types.h-data
@@ -1,9 +1,13 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11
 #if !defined POSIX
+# if !defined XPG3 && !defined XPG4
 type blkcnt_t
 type blksize_t
+# endif
 type clock_t
+# if !defined XPG3 && !defined XPG4
 type clockid_t
+# endif
 #endif
 type dev_t
 # if !defined POSIX

-- 
Joseph S. Myers
joseph@codesourcery.com