conformtest: Enable complex.h and inttypes.h testing for XOPEN2K8.

diff --git a/ChangeLog b/ChangeLog
index 13bb8c6..c13fe18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-11-02  Joseph Myers  <joseph@codesourcery.com>
 
+       * conform/data/complex.h-data [ISO99 || ISO11 || XOPEN2K ||
+       POSIX2008]: Change condition to [!ISO && !POSIX && !XPG3 && !XPG4
+       && !UNIX98].  Enables tests for XOPEN2K8.
+       * conform/data/inttypes.h-data [ISO99 || ISO11 || XOPEN2K ||
+       POSIX2008]: Likewise.
+
        * conform/data/sys/wait.h-data [XPG3 || XOPEN2K8 || POSIX2008]
        (struct rusage): Do not expect type or its members.
 

diff --git a/conform/data/complex.h-data b/conform/data/complex.h-data
index 8f31d22..8abfb50 100644 (file)
--- a/conform/data/complex.h-data
+++ b/conform/data/complex.h-data
@@ -1,4 +1,4 @@
-#if defined ISO99 || defined ISO11 || defined XOPEN2K || defined POSIX2008
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 macro complex
 macro _Complex_I
 optional-macro imaginary

diff --git a/conform/data/inttypes.h-data b/conform/data/inttypes.h-data
index d308a52..5ef54f6 100644 (file)
--- a/conform/data/inttypes.h-data
+++ b/conform/data/inttypes.h-data
@@ -1,4 +1,4 @@
-#if defined ISO99 || defined ISO11 || defined XOPEN2K || defined POSIX2008
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 type int8_t
 type int16_t
 type int32_t