From 2e3e1b3309f8a8d86c6b5f97cc6c347c05a0e44b Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 12 Jan 2010 20:11:10 -0800
Subject: [PATCH] More test suite fixes.

---
 ChangeLog                   |  6 ++++++
 conform/data/complex.h-data |  2 +-
 conform/data/ctype.h-data   | 18 +++++++++---------
 conform/data/dirent.h-data  |  2 ++
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd8178494f..61c64db6c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-12  Ulrich Drepper  <drepper@redhat.com>
 
+	* conform/data/complex.h-data: Test for POSIX2008.
+
+	* conform/data/ctype.h-data: Fix POSIX testing.
+
+	* conform/data/dirent.h-data: ino_t only needed for XSI.
+
 	* grp/grp.h: Declare getgrent and endgrent for XPG7.
 
 	* conform/data/inttypes.h-data: Use same types as the headers.
diff --git a/conform/data/complex.h-data b/conform/data/complex.h-data
index 5c5eedd181..006d6e4de7 100644
--- a/conform/data/complex.h-data
+++ b/conform/data/complex.h-data
@@ -1,4 +1,4 @@
-#ifdef XOPEN2K
+#if defined XOPEN2K || defined POSIX2008
 macro complex
 macro _Complex_I
 optional-macro imaginary
diff --git a/conform/data/ctype.h-data b/conform/data/ctype.h-data
index d082230f94..091d377bec 100644
--- a/conform/data/ctype.h-data
+++ b/conform/data/ctype.h-data
@@ -19,15 +19,9 @@ function int toascii (int)
 // XPG says the following two are macros.  But we test a bit more strictly.
 function int _toupper (int)
 function int _tolower (int)
+#endif
 
-// The following is not entirely correct.  It should be is[a-z]* but the
-// replacement fnmatch implementation does not grok it.
-allow is*
-allow to*
-
-allow *_t
-
-# if defined XOPEN2K8 || defined XOPEN2K8 || defined POSIX2008
+# if defined XOPEN2K8 || defined POSIX2008
 type locale_t
 
 function int isalnum_l (int, locale_t)
@@ -44,4 +38,10 @@ function int isxdigit_l (int, locale_t)
 function int tolower_l (int, locale_t)
 function int toupper_l (int, locale_t)
 # endif
-#endif
+
+// The following is not entirely correct.  It should be is[a-z]* but the
+// replacement fnmatch implementation does not grok it.
+allow is*
+allow to*
+
+allow *_t
diff --git a/conform/data/dirent.h-data b/conform/data/dirent.h-data
index 761d5786b5..f1cd59cdaf 100644
--- a/conform/data/dirent.h-data
+++ b/conform/data/dirent.h-data
@@ -8,7 +8,9 @@ element {struct dirent} ino_t d_ino
 # endif
 element {struct dirent} char d_name []
 
+# if !defined POSIX && !defined POSIX2008
 type ino_t
+#endif
 
 function int closedir (DIR*)
 function {DIR*} opendir (const char*)