re PR libstdc++/33771 (FAIL: 17_intro/headers/c++1998/all.cc (test for excess errors))

2007-10-15  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/33771
	PR libstdc++/33773
	* testsuite/21_strings/headers/cwchar/macros.cc: Guard test with
	_GLIBCXX_HAVE_WCHAR_H.
	* testsuite/21_strings/headers/cwctype/macros.cc: Likewise with
	_GLIBCXX_HAVE_WCTYPE_H.
	* testsuite/17_intro/headers/c++200x/all.cc: Guard inclusions
	of <wchar.h> and <wctype.h>.
	* testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc:
	Likewise.
	* testsuite/17_intro/headers/c++1998/all.cc: Likewise.
	* testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc:
	Likewise.

From-SVN: r129313

diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all.cc
index 2704e491f4d52ae6ab7ec4daf55df9adbf390814..6416734276a1b876089e7f96dcc312ddc1205755 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all.cc
@@ -61,8 +61,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#ifdef _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>
+#endif
+#ifdef _GLIBCXX_HAVE_WCTYPE_H
 #include <wctype.h>
+#endif
 
 // "C++" headers
 #include <algorithm>

diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc
index a1cb289039a063e6516580d1c166cbeb981905f1..831616b9512d0127164fff3abc801f3b854dac7b 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc
@@ -61,8 +61,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#ifdef _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>
+#endif
+#ifdef _GLIBCXX_HAVE_WCTYPE_H
 #include <wctype.h>
+#endif
 
 // "C++" headers
 #include <algorithm>
@@ -136,8 +140,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#ifdef _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>
+#endif
+#ifdef _GLIBCXX_HAVE_WCTYPE_H
 #include <wctype.h>
+#endif
 
 // "C++" headers
 #include <algorithm>

diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc
index 76566d0ac918f64c1f857658f7a804215c81966b..753f08e007785e6865de69ae3c1b6a91f259a8b0 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc
@@ -82,8 +82,12 @@
 #include <tgmath.h>
 #endif
 #include <time.h>
+#ifdef _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>
+#endif
+#ifdef _GLIBCXX_HAVE_WCTYPE_H
 #include <wctype.h>
+#endif
 
 // "C++" headers
 #include <algorithm>

diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc
index d788be21578a185e8964e07f892cdbd6e70bffaa..9aa802c7041e4bb9291668d268a4b19fe2429c45 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc
@@ -82,8 +82,12 @@
 #include <tgmath.h>
 #endif
 #include <time.h>
+#ifdef _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>
+#endif
+#ifdef _GLIBCXX_HAVE_WCTYPE_H
 #include <wctype.h>
+#endif
 
 // "C++" headers
 #include <algorithm>
@@ -188,8 +192,12 @@
 #include <tgmath.h>
 #endif
 #include <time.h>
+#ifdef _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>
+#endif
+#ifdef _GLIBCXX_HAVE_WCTYPE_H
 #include <wctype.h>
+#endif
 
 // "C++" headers
 #include <algorithm>

diff --git a/libstdc++-v3/testsuite/21_strings/headers/cwchar/macros.cc b/libstdc++-v3/testsuite/21_strings/headers/cwchar/macros.cc
index 17d6129dd901957e6704a6983e0376b018ca2bd7..b80db00bb547d8fa17a01cc719f9335bd69bf910 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/headers/cwchar/macros.cc
+++ b/libstdc++-v3/testsuite/21_strings/headers/cwchar/macros.cc
@@ -20,6 +20,8 @@
 
 #include <cwchar>
 
+#ifdef _GLIBCXX_HAVE_WCHAR_H
+
 namespace gnu
 {
 #ifndef NULL
@@ -38,3 +40,5 @@ namespace gnu
     #error "WEOF_must_be_a_macro"
 #endif
 }
+
+#endif

diff --git a/libstdc++-v3/testsuite/21_strings/headers/cwctype/macros.cc b/libstdc++-v3/testsuite/21_strings/headers/cwctype/macros.cc
index a1d78c75c00c34f994853f8a8d40141463030880..ae2e401919287baab73a12007630edb55a103034 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/headers/cwctype/macros.cc
+++ b/libstdc++-v3/testsuite/21_strings/headers/cwctype/macros.cc
@@ -20,9 +20,13 @@
 
 #include <cwctype>
 
+#ifdef _GLIBCXX_HAVE_WCTYPE_H
+
 namespace gnu
 {
 #ifndef WEOF
     #error "WEOF_must_be_a_macro"
 #endif
 }
+
+#endif