This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

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


I noticed that the conform/ test data for complex.h and inttypes.h
failed to enable those tests for XOPEN2K8 - which doesn't make sense
since these headers are in C99, and XOPEN2K8 is a superset of
POSIX2008, which is a superset of C99.

This patch switches the tests of those headers to use the more normal
negative form of conditions in these data files (i.e., disabling the
contents for the old standards not based on C99, so implicitly
enabling them for all other standards).  The only standard affected by
this patch is XOPEN2K8 - on x86_64 it gains 308 extra tests (from 5539
to 5847) with no extra failures.

Note: the new condition isn't quite right either for inttypes.h, which
is present in UNIX98 but with more limited contents there than in
C99.  But there's no change in this patch to the status quo of
inttypes.h not being tested at all for UNIX98; fixing that would be a
matter for a separate patch.

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.

diff --git a/conform/data/complex.h-data b/conform/data/complex.h-data
index 8f31d22..8abfb50 100644
--- 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
--- 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

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]