conformtest: Don't test non-C90 headers for C90.

diff --git a/ChangeLog b/ChangeLog
index b783dd3668b3af59876fc0210050700cc7acb44c..cc86a62cad8115c7723e9047e4cab1a614f16d1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-05-01  Joseph Myers  <joseph@codesourcery.com>
 
+       * conform/data/iso646.h-data [ISO || POSIX || XPG3 || XPG4]:
+       Disable tests.
+       * conform/data/stdint.h-data [ISO || POSIX || XPG3 || XPG4 ||
+       UNIX98]: Likewise.
+
        * conform/conformtest.pl: Handle "macro-int-constant" and test for
        usability of symbols in #if.
 

diff --git a/conform/data/iso646.h-data b/conform/data/iso646.h-data
index ffbf489f7ae1a9e01c25f89f0219693a67e109e3..7ac7d09abb36ad377e0d9adb401c82ca6d41905b 100644 (file)
--- a/conform/data/iso646.h-data
+++ b/conform/data/iso646.h-data
@@ -1,3 +1,4 @@
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4
 macro and
 macro and_eq
 macro bitand
@@ -11,3 +12,4 @@ macro xor
 macro xor_eq
 
 allow *_t
+#endif

diff --git a/conform/data/stdint.h-data b/conform/data/stdint.h-data
index 5b3fb17f4ec5c9f086aa0fe35f5d0247bdfb17a2..99bdf22ac6ceff38004146befd1b5f2030502dc4 100644 (file)
--- a/conform/data/stdint.h-data
+++ b/conform/data/stdint.h-data
@@ -1,3 +1,4 @@
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 type int8_t
 type int16_t
 type int32_t
@@ -112,3 +113,4 @@ macro UINTMAX_C
 // fnamtch implementation doesn't grok the right form.
 allow INT*
 allow UINT*
+#endif