about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--conform/data/iso646.h-data2
-rw-r--r--conform/data/stdint.h-data2
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b783dd3668..cc86a62cad 100644
--- 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 ffbf489f7a..7ac7d09abb 100644
--- 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 5b3fb17f4e..99bdf22ac6 100644
--- 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