From 025375348e10d44984dba0e68a2c04e7cbb6fb8c Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Sun, 6 May 2007 11:51:23 +0000
Subject: [PATCH] re PR libstdc++/31836 (FAIL:
 27_io/basic_istream/extractors_arithmetic/char/12.cc execution test)

2007-05-06  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/31836
	* testsuite/17_intro/headers/c++200x/all.cc: Protect inclusion
	of C99 headers.
	* testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc:
	Likewise.

From-SVN: r124472
---
 libstdc++-v3/ChangeLog                        |  8 +++++++
 .../testsuite/17_intro/headers/c++200x/all.cc | 12 ++++++++++
 .../headers/c++200x/all_multiple_inclusion.cc | 24 +++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 958a71510ab..47f0470e6d9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-06  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/31836
+	* testsuite/17_intro/headers/c++200x/all.cc: Protect inclusion
+	of C99 headers.
+	* testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc:
+	Likewise.
+
 2007-05-06  Paolo Carlini  <pcarlini@suse.de>
 
 	* config/locale/generic/c_locale.cc: Don't use __builtin_huge_val*
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 6e3d111bb82..76566d0ac91 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc
@@ -49,12 +49,18 @@
 
 // "C" compatibility headers
 #include <assert.h>
+#ifdef _GLIBCXX_HAVE_COMPLEX_H
 #include <complex.h>
+#endif
 #include <ctype.h>
 #include <errno.h>
+#ifdef _GLIBCXX_HAVE_FENV_H
 #include <fenv.h>
+#endif
 #include <float.h>
+#ifdef _GLIBCXX_HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 #include <iso646.h>
 #include <limits.h>
 #include <locale.h>
@@ -62,13 +68,19 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <stdarg.h>
+#ifdef _GLIBCXX_HAVE_STDBOOL_H
 #include <stdbool.h>
+#endif
 #include <stddef.h>
+#ifdef _GLIBCXX_HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef _GLIBCXX_HAVE_TGMATH_H
 #include <tgmath.h>
+#endif
 #include <time.h>
 #include <wchar.h>
 #include <wctype.h>
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 f87ff666895..d788be21578 100644
--- 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
@@ -49,12 +49,18 @@
 
 // "C" compatibility headers
 #include <assert.h>
+#ifdef _GLIBCXX_HAVE_COMPLEX_H
 #include <complex.h>
+#endif
 #include <ctype.h>
 #include <errno.h>
+#ifdef _GLIBCXX_HAVE_FENV_H
 #include <fenv.h>
+#endif
 #include <float.h>
+#ifdef _GLIBCXX_HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 #include <iso646.h>
 #include <limits.h>
 #include <locale.h>
@@ -62,13 +68,19 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <stdarg.h>
+#ifdef _GLIBCXX_HAVE_STDBOOL_H
 #include <stdbool.h>
+#endif
 #include <stddef.h>
+#ifdef _GLIBCXX_HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef _GLIBCXX_HAVE_TGMATH_H
 #include <tgmath.h>
+#endif
 #include <time.h>
 #include <wchar.h>
 #include <wctype.h>
@@ -143,12 +155,18 @@
 
 // "C" compatibility headers
 #include <assert.h>
+#ifdef _GLIBCXX_HAVE_COMPLEX_H
 #include <complex.h>
+#endif
 #include <ctype.h>
 #include <errno.h>
+#ifdef _GLIBCXX_HAVE_FENV_H
 #include <fenv.h>
+#endif
 #include <float.h>
+#ifdef _GLIBCXX_HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 #include <iso646.h>
 #include <limits.h>
 #include <locale.h>
@@ -156,13 +174,19 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <stdarg.h>
+#ifdef _GLIBCXX_HAVE_STDBOOL_H
 #include <stdbool.h>
+#endif
 #include <stddef.h>
+#ifdef _GLIBCXX_HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef _GLIBCXX_HAVE_TGMATH_H
 #include <tgmath.h>
+#endif
 #include <time.h>
 #include <wchar.h>
 #include <wctype.h>
-- 
2.30.2