backport: re PR libstdc++/38000 (System header files not found once -isystem /usr/include is used)

2009-01-08 Paolo Carlini <paolo.carlini@oracle.com> Backport from mainline: 2008-11-13 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/38000 * include/c_global/csignal: Do not use include_next. * include/c_global/cstdlib: Likewise. * include/c_global/cstdio: Likewise. * include/c_global/cstdarg: Likewise. * include/c_global/cctype: Likewise. * include/c_global/cerrno: Likewise. * include/c_global/cmath: Likewise. * include/c_global/clocale: Likewise. * include/c_global/climits: Likewise. * include/c_global/cassert: Likewise. * include/c_global/csetjmp: Likewise. * include/c_global/cwchar: Likewise. * include/c_global/cfloat: Likewise. * include/c_global/cstdbool: Likewise. * include/c_global/cstring: Likewise. * include/c_global/cstddef: Likewise. * include/c_global/cwctype: Likewise. * include/tr1/cstdbool: Likewise. * include/tr1_impl/cinttypes: Do not include <inttypes.h>. * include/c_global/cinttypes: Do it here. * include/tr1/cinttypes: Likewise. * include/tr1_impl/cfenv: Do not include <fenv.h>. * include/c_global/cfenv: Do it here. * include/tr1/cfenv: Likewise. * include/tr1_impl/cstdint: Do not include <stdint.h>. * include/c_global/cstdint: Do it here. * include/tr1/cstdint: Likewise. * include/c_compatibility/fenv.h: Include <tr1_impl/cfenv>. * include/c_compatibility/stdint.h: Include <tr1_impl/cstdint>. * include/c_compatibility/inttypes.h: Include <tr1_impl/cinttypes>. * include/c_compatibility/math.h: Minor tweak, add comment. From-SVN: r143194
2009-01-09 00:00:17 +00:00 · 2009-01-09 00:00:17 +00:00 · 2b63cb49f1
commit 2b63cb49f1
parent 0d1758e3f7
33 changed files with 308 additions and 100 deletions
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@ -1,3 +1,42 @@
+2009-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	Backport from mainline:
+	2008-11-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR libstdc++/38000
+	* include/c_global/csignal: Do not use include_next.
+	* include/c_global/cstdlib: Likewise.
+	* include/c_global/cstdio: Likewise.
+	* include/c_global/cstdarg: Likewise.
+	* include/c_global/cctype: Likewise.
+	* include/c_global/cerrno: Likewise.
+	* include/c_global/cmath: Likewise.
+	* include/c_global/clocale: Likewise.
+	* include/c_global/climits: Likewise.
+	* include/c_global/cassert: Likewise.
+	* include/c_global/csetjmp: Likewise.
+	* include/c_global/cwchar: Likewise.
+	* include/c_global/cfloat: Likewise.
+	* include/c_global/cstdbool: Likewise.
+	* include/c_global/cstring: Likewise.
+	* include/c_global/cstddef: Likewise.
+	* include/c_global/cwctype: Likewise.
+	* include/tr1/cstdbool: Likewise.
+	* include/tr1_impl/cinttypes: Do not include <inttypes.h>.
+	* include/c_global/cinttypes: Do it here.
+	* include/tr1/cinttypes: Likewise.
+	* include/tr1_impl/cfenv: Do not include <fenv.h>.
+	* include/c_global/cfenv: Do it here.
+	* include/tr1/cfenv: Likewise.
+	* include/tr1_impl/cstdint: Do not include <stdint.h>.
+	* include/c_global/cstdint: Do it here.
+	* include/tr1/cstdint: Likewise.
+	* include/c_compatibility/fenv.h: Include <tr1_impl/cfenv>.
+	* include/c_compatibility/stdint.h: Include <tr1_impl/cstdint>.
+	* include/c_compatibility/inttypes.h: Include <tr1_impl/cinttypes>.
+
+	* include/c_compatibility/math.h: Minor tweak, add comment.
+
 2008-12-12  H.J. Lu  <hongjiu.lu@intel.com>

 	Backport from mainline:
--- a/libstdc++-v3/include/c_compatibility/fenv.h
+++ b/libstdc++-v3/include/c_compatibility/fenv.h
@ -1,6 +1,6 @@
 // -*- C++ -*- compatibility header.

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -31,17 +31,33 @@
 *  This is a Standard C++ Library header.
 */

-#include <bits/c++config.h>
-
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-# include <cfenv>
-#else
-# if _GLIBCXX_HAVE_FENV_H
-#  include_next <fenv.h>
-# endif
-#endif
-
 #ifndef _GLIBCXX_FENV_H
 #define _GLIBCXX_FENV_H 1

+#pragma GCC system_header
+
+#include <bits/c++config.h>
+#if _GLIBCXX_HAVE_FENV_H
+# include_next <fenv.h>
 #endif
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#  if defined(_GLIBCXX_INCLUDE_AS_TR1)
+#    error C++0x header cannot be included from TR1 header
+#  endif
+#  if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
+#    include <tr1_impl/cfenv>
+#  else
+#    define _GLIBCXX_INCLUDE_AS_CXX0X
+#    define _GLIBCXX_BEGIN_NAMESPACE_TR1
+#    define _GLIBCXX_END_NAMESPACE_TR1
+#    define _GLIBCXX_TR1
+#    include <tr1_impl/cfenv>
+#    undef _GLIBCXX_TR1
+#    undef _GLIBCXX_END_NAMESPACE_TR1
+#    undef _GLIBCXX_BEGIN_NAMESPACE_TR1
+#    undef _GLIBCXX_INCLUDE_AS_CXX0X
+#  endif
+#endif
+
+#endif // _GLIBCXX_FENV_H
--- a/libstdc++-v3/include/c_compatibility/inttypes.h
+++ b/libstdc++-v3/include/c_compatibility/inttypes.h
@ -1,6 +1,6 @@
 // -*- C++ -*- compatibility header.

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -31,17 +31,51 @@
 *  This is a Standard C++ Library header.
 */

-#include <bits/c++config.h>
-
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-# include <cinttypes>
-#else
-# if _GLIBCXX_HAVE_INTTYPES_H
-#  include_next <inttypes.h>
-# endif
-#endif
-
 #ifndef _GLIBCXX_INTTYPES_H
 #define _GLIBCXX_INTTYPES_H 1

-#endif
+#pragma GCC system_header
+
+#include <bits/c++config.h>
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+
+// For 8.11.1/1 (see C99, Note 184)
+# if _GLIBCXX_HAVE_INTTYPES_H
+#  ifndef __STDC_FORMAT_MACROS
+#   define _UNDEF__STDC_FORMAT_MACROS
+#   define __STDC_FORMAT_MACROS
+#  endif
+#  include_next <inttypes.h>
+#  ifdef _UNDEF__STDC_FORMAT_MACROS
+#   undef __STDC_FORMAT_MACROS
+#   undef _UNDEF__STDC_FORMAT_MACROS
+#  endif
+# endif
+
+# if defined(_GLIBCXX_INCLUDE_AS_TR1)
+#  error C++0x header cannot be included from TR1 header
+# endif
+# if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
+#  include <tr1_impl/cinttypes>
+# else
+#  define _GLIBCXX_INCLUDE_AS_CXX0X
+#  define _GLIBCXX_BEGIN_NAMESPACE_TR1
+#  define _GLIBCXX_END_NAMESPACE_TR1
+#  define _GLIBCXX_TR1
+#  include <tr1_impl/cinttypes>
+#  undef _GLIBCXX_TR1
+#  undef _GLIBCXX_END_NAMESPACE_TR1
+#  undef _GLIBCXX_BEGIN_NAMESPACE_TR1
+#  undef _GLIBCXX_INCLUDE_AS_CXX0X
+# endif
+
+#else
+
+# if _GLIBCXX_HAVE_INTTYPES_H
+#  include_next <inttypes.h>
+# endif
+
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
+#endif // _GLIBCXX_INTTYPES_H
--- a/libstdc++-v3/include/c_compatibility/math.h
+++ b/libstdc++-v3/include/c_compatibility/math.h
@ -1,6 +1,7 @@
 // -*- C++ -*- compatibility header.

-// Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -76,6 +77,6 @@ using std::islessgreater;
 using std::isunordered;
 #endif

-#endif // __GXX_EXPERIMENTAL_CXX0X__
+#endif

 #endif
--- a/libstdc++-v3/include/c_compatibility/stdint.h
+++ b/libstdc++-v3/include/c_compatibility/stdint.h
@ -1,6 +1,6 @@
 // -*- C++ -*- compatibility header.

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -31,17 +31,59 @@
 *  This is a Standard C++ Library header.
 */

-#include <bits/c++config.h>
-
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-# include <cstdint>
-#else
-# if _GLIBCXX_HAVE_STDINT_H
-#  include_next <stdint.h>
-# endif
-#endif
-
 #ifndef _GLIBCXX_STDINT_H
 #define _GLIBCXX_STDINT_H 1

-#endif
+#pragma GCC system_header
+
+#include <bits/c++config.h>
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+
+// For 8.22.1/1 (see C99, Notes 219, 220, 222)
+# if _GLIBCXX_HAVE_STDINT_H
+#  ifndef __STDC_LIMIT_MACROS
+#   define _UNDEF__STDC_LIMIT_MACROS
+#   define __STDC_LIMIT_MACROS
+#  endif
+#  ifndef __STDC_CONSTANT_MACROS
+#   define _UNDEF__STDC_CONSTANT_MACROS
+#   define __STDC_CONSTANT_MACROS
+#  endif
+#  include_next <stdint.h>
+#  ifdef _UNDEF__STDC_LIMIT_MACROS
+#   undef __STDC_LIMIT_MACROS
+#   undef _UNDEF__STDC_LIMIT_MACROS
+#  endif
+#  ifdef _UNDEF__STDC_CONSTANT_MACROS
+#   undef __STDC_CONSTANT_MACROS
+#   undef _UNDEF__STDC_CONSTANT_MACROS
+#  endif
+# endif
+
+# if defined(_GLIBCXX_INCLUDE_AS_TR1)
+#  error C++0x header cannot be included from TR1 header
+# endif
+# if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
+#  include <tr1_impl/cstdint>
+# else
+#  define _GLIBCXX_INCLUDE_AS_CXX0X
+#  define _GLIBCXX_BEGIN_NAMESPACE_TR1
+#  define _GLIBCXX_END_NAMESPACE_TR1
+#  define _GLIBCXX_TR1
+#  include <tr1_impl/cstdint>
+#  undef _GLIBCXX_TR1
+#  undef _GLIBCXX_END_NAMESPACE_TR1
+#  undef _GLIBCXX_BEGIN_NAMESPACE_TR1
+#  undef _GLIBCXX_INCLUDE_AS_CXX0X
+# endif
+
+#else
+
+# if _GLIBCXX_HAVE_STDINT_H
+#  include_next <stdint.h>
+# endif
+
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
+#endif // _GLIBCXX_STDINT_H
--- a/libstdc++-v3/include/c_global/cassert
+++ b/libstdc++-v3/include/c_global/cassert
@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -46,4 +47,4 @@

 #pragma GCC system_header

-#include_next <assert.h>
+#include <assert.h>
--- a/libstdc++-v3/include/c_global/cctype
+++ b/libstdc++-v3/include/c_global/cctype
@ -1,7 +1,7 @@
 // -*- C++ -*- forwarding header.

 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -46,7 +46,7 @@
 #pragma GCC system_header

 #include <bits/c++config.h>
-#include_next <ctype.h>
+#include <ctype.h>

 #ifndef _GLIBCXX_CCTYPE
 #define _GLIBCXX_CCTYPE 1
--- a/libstdc++-v3/include/c_global/cerrno
+++ b/libstdc++-v3/include/c_global/cerrno
@ -1,6 +1,7 @@
 // The -*- C++ -*- forwarding header.

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -44,7 +45,7 @@

 #pragma GCC system_header

-#include_next <errno.h>
+#include <errno.h>

 #ifndef _GLIBCXX_CERRNO
 #define _GLIBCXX_CERRNO 1
--- a/libstdc++-v3/include/c_global/cfenv
+++ b/libstdc++-v3/include/c_global/cfenv
@ -1,6 +1,6 @@
 // <cfenv> -*- C++ -*-

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -31,11 +31,11 @@
 *  This is a Standard C++ Library header.
 */

-#pragma GCC system_header
-
 #ifndef _GLIBCXX_CFENV
 #define _GLIBCXX_CFENV 1

+#pragma GCC system_header
+
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
 #endif
@ -45,6 +45,9 @@
 #endif

 #include <bits/c++config.h>
+#if _GLIBCXX_HAVE_FENV_H
+# include <fenv.h>
+#endif

 #if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
 #  include <tr1_impl/cfenv>
@ -60,4 +63,4 @@
 #  undef _GLIBCXX_INCLUDE_AS_CXX0X
 #endif

-#endif
+#endif // _GLIBCXX_CFENV
--- a/libstdc++-v3/include/c_global/cfloat
+++ b/libstdc++-v3/include/c_global/cfloat
@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -44,7 +45,7 @@

 #pragma GCC system_header

-#include_next <float.h>
+#include <float.h>

 #ifndef _GLIBCXX_CFLOAT
 #define _GLIBCXX_CFLOAT 1
--- a/libstdc++-v3/include/c_global/cinttypes
+++ b/libstdc++-v3/include/c_global/cinttypes
@ -1,6 +1,6 @@
 // <cinttypes> -*- C++ -*-

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -31,11 +31,11 @@
 *  This is a Standard C++ Library header.
 */

-#pragma GCC system_header
-
 #ifndef _GLIBCXX_CINTTYPES
 #define _GLIBCXX_CINTTYPES 1

+#pragma GCC system_header
+
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
 #endif
@ -46,6 +46,19 @@

 #include <cstdint>

+// For 8.11.1/1 (see C99, Note 184)
+#if _GLIBCXX_HAVE_INTTYPES_H
+# ifndef __STDC_FORMAT_MACROS
+#  define _UNDEF__STDC_FORMAT_MACROS
+#  define __STDC_FORMAT_MACROS
+# endif
+# include <inttypes.h>
+# ifdef _UNDEF__STDC_FORMAT_MACROS
+#  undef __STDC_FORMAT_MACROS
+#  undef _UNDEF__STDC_FORMAT_MACROS
+# endif
+#endif
+
 #if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
 #  include <tr1_impl/cinttypes>
 #else
@ -60,4 +73,4 @@
 #  undef _GLIBCXX_INCLUDE_AS_CXX0X
 #endif

-#endif
+#endif // _GLIBCXX_CINTTYPES
--- a/libstdc++-v3/include/c_global/climits
+++ b/libstdc++-v3/include/c_global/climits
@ -45,7 +45,7 @@

 #pragma GCC system_header

-#include_next <limits.h>
+#include <limits.h>

 #ifndef _GLIBCXX_CLIMITS
 #define _GLIBCXX_CLIMITS 1
--- a/libstdc++-v3/include/c_global/clocale
+++ b/libstdc++-v3/include/c_global/clocale
@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -45,7 +46,7 @@
 #pragma GCC system_header

 #include <bits/c++config.h>
-#include_next <locale.h>
+#include <locale.h>

 #ifndef _GLIBCXX_CLOCALE
 #define _GLIBCXX_CLOCALE 1
--- a/libstdc++-v3/include/c_global/cmath
+++ b/libstdc++-v3/include/c_global/cmath
@ -48,7 +48,7 @@
 #include <bits/c++config.h>
 #include <bits/cpp_type_traits.h>
 #include <ext/type_traits.h>
-#include_next <math.h>
+#include <math.h>

 #ifndef _GLIBCXX_CMATH
 #define _GLIBCXX_CMATH 1
--- a/libstdc++-v3/include/c_global/csetjmp
+++ b/libstdc++-v3/include/c_global/csetjmp
@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -45,7 +46,7 @@
 #pragma GCC system_header

 #include <bits/c++config.h>
-#include_next <setjmp.h>
+#include <setjmp.h>

 #ifndef _GLIBCXX_CSETJMP
 #define _GLIBCXX_CSETJMP 1
--- a/libstdc++-v3/include/c_global/csignal
+++ b/libstdc++-v3/include/c_global/csignal
@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -45,7 +46,7 @@
 #pragma GCC system_header

 #include <bits/c++config.h>
-#include_next <signal.h>
+#include <signal.h>

 #ifndef _GLIBCXX_CSIGNAL
 #define _GLIBCXX_CSIGNAL 1
--- a/libstdc++-v3/include/c_global/cstdarg
+++ b/libstdc++-v3/include/c_global/cstdarg
@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -45,7 +46,7 @@
 #pragma GCC system_header

 #include <bits/c++config.h>
-#include_next <stdarg.h>
+#include <stdarg.h>

 #ifndef _GLIBCXX_CSTDARG
 #define _GLIBCXX_CSTDARG 1
--- a/libstdc++-v3/include/c_global/cstdbool
+++ b/libstdc++-v3/include/c_global/cstdbool
@ -1,6 +1,6 @@
 // <cstdbool> -*- C++ -*-

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -41,7 +41,7 @@
 #else
 #  include <bits/c++config.h>
 #  if _GLIBCXX_HAVE_STDBOOL_H
-#    include_next <stdbool.h>
+#    include <stdbool.h>
 #  endif
 #endif

--- a/libstdc++-v3/include/c_global/cstddef
+++ b/libstdc++-v3/include/c_global/cstddef
@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -45,7 +46,7 @@
 #pragma GCC system_header

 #include <bits/c++config.h>
-#include_next <stddef.h>
+#include <stddef.h>

 #ifndef _GLIBCXX_CSTDDEF
 #define _GLIBCXX_CSTDDEF 1
--- a/libstdc++-v3/include/c_global/cstdint
+++ b/libstdc++-v3/include/c_global/cstdint
@ -1,6 +1,6 @@
 // <cstdint> -*- C++ -*-

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -31,11 +31,11 @@
 *  This is a Standard C++ Library header.
 */

-#pragma GCC system_header
-
 #ifndef _GLIBCXX_CSTDINT
 #define _GLIBCXX_CSTDINT 1

+#pragma GCC system_header
+
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
 #endif
@ -46,6 +46,27 @@

 #include <bits/c++config.h>

+// For 8.22.1/1 (see C99, Notes 219, 220, 222)
+#if _GLIBCXX_HAVE_STDINT_H
+# ifndef __STDC_LIMIT_MACROS
+#  define _UNDEF__STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS
+# endif
+# ifndef __STDC_CONSTANT_MACROS
+#  define _UNDEF__STDC_CONSTANT_MACROS
+#  define __STDC_CONSTANT_MACROS
+# endif
+# include <stdint.h>
+# ifdef _UNDEF__STDC_LIMIT_MACROS
+#  undef __STDC_LIMIT_MACROS
+#  undef _UNDEF__STDC_LIMIT_MACROS
+# endif
+# ifdef _UNDEF__STDC_CONSTANT_MACROS
+#  undef __STDC_CONSTANT_MACROS
+#  undef _UNDEF__STDC_CONSTANT_MACROS
+# endif
+#endif
+
 #if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
 #  include <tr1_impl/cstdint>
 #else
@ -60,4 +81,4 @@
 #  undef _GLIBCXX_INCLUDE_AS_CXX0X
 #endif

-#endif
+#endif // _GLIBCXX_CSTDINT
--- a/libstdc++-v3/include/c_global/cstdio
+++ b/libstdc++-v3/include/c_global/cstdio
@ -1,7 +1,7 @@
 // -*- C++ -*- forwarding header.

 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -47,7 +47,7 @@

 #include <bits/c++config.h>
 #include <cstddef>
-#include_next <stdio.h>
+#include <stdio.h>

 #ifndef _GLIBCXX_CSTDIO
 #define _GLIBCXX_CSTDIO 1
--- a/libstdc++-v3/include/c_global/cstdlib
+++ b/libstdc++-v3/include/c_global/cstdlib
@ -1,7 +1,7 @@
 // -*- C++ -*- forwarding header.

 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -70,7 +70,7 @@ _GLIBCXX_END_NAMESPACE

 #else

-#include_next <stdlib.h>
+#include <stdlib.h>

 // Get rid of those macros defined in <stdlib.h> in lieu of real functions.
 #undef abort
--- a/libstdc++-v3/include/c_global/cstring
+++ b/libstdc++-v3/include/c_global/cstring
@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -46,7 +47,7 @@

 #include <bits/c++config.h>
 #include <cstddef>
-#include_next <string.h>
+#include <string.h>

 #ifndef _GLIBCXX_CSTRING
 #define _GLIBCXX_CSTRING 1
--- a/libstdc++-v3/include/c_global/ctime
+++ b/libstdc++-v3/include/c_global/ctime
@ -1,7 +1,7 @@
 // -*- C++ -*- forwarding header.

 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -46,7 +46,7 @@
 #pragma GCC system_header

 #include <cstddef>
-#include_next <time.h>
+#include <time.h>

 #ifndef _GLIBCXX_CTIME
 #define _GLIBCXX_CTIME 1
--- a/libstdc++-v3/include/c_global/cwchar
+++ b/libstdc++-v3/include/c_global/cwchar
@ -1,7 +1,7 @@
 // -*- C++ -*- forwarding header.

 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -49,7 +49,7 @@
 #include <cstddef>

 #if _GLIBCXX_HAVE_WCHAR_H
-#include_next <wchar.h>
+#include <wchar.h>
 #endif

 #ifndef _GLIBCXX_CWCHAR
--- a/libstdc++-v3/include/c_global/cwctype
+++ b/libstdc++-v3/include/c_global/cwctype
@ -1,7 +1,7 @@
 // -*- C++ -*- forwarding header.

 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@ -48,7 +48,7 @@
 #include <bits/c++config.h>

 #if _GLIBCXX_HAVE_WCTYPE_H
-#include_next <wctype.h>
+#include <wctype.h>
 #endif

 #ifndef _GLIBCXX_CWCTYPE
--- a/libstdc++-v3/include/tr1/cfenv
+++ b/libstdc++-v3/include/tr1/cfenv
@ -1,6 +1,6 @@
 // TR1 cfenv -*- C++ -*-

-// Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+// Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -34,7 +34,12 @@
 #ifndef _GLIBCXX_TR1_CFENV
 #define _GLIBCXX_TR1_CFENV 1

+#pragma GCC system_header
+
 #include <bits/c++config.h>
+#if _GLIBCXX_HAVE_FENV_H
+# include <fenv.h>
+#endif

 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  include <tr1_impl/cfenv>
--- a/libstdc++-v3/include/tr1/cinttypes
+++ b/libstdc++-v3/include/tr1/cinttypes
@ -34,8 +34,23 @@
 #ifndef _GLIBCXX_TR1_CINTTYPES
 #define _GLIBCXX_TR1_CINTTYPES 1

+#pragma GCC system_header
+
 #include <tr1/cstdint>

+// For 8.11.1/1 (see C99, Note 184)
+#if _GLIBCXX_HAVE_INTTYPES_H
+# ifndef __STDC_FORMAT_MACROS
+#  define _UNDEF__STDC_FORMAT_MACROS
+#  define __STDC_FORMAT_MACROS
+# endif
+# include <inttypes.h>
+# ifdef _UNDEF__STDC_FORMAT_MACROS
+#  undef __STDC_FORMAT_MACROS
+#  undef _UNDEF__STDC_FORMAT_MACROS
+# endif
+#endif
+
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  include <tr1_impl/cinttypes>
 #else
--- a/libstdc++-v3/include/tr1/cstdbool
+++ b/libstdc++-v3/include/tr1/cstdbool
@ -39,7 +39,7 @@
 #include <bits/c++config.h>

 #if _GLIBCXX_HAVE_STDBOOL_H
-#include_next <stdbool.h>
+#include <stdbool.h>
 #endif

 #endif // _GLIBCXX_TR1_CSTDBOOL
--- a/libstdc++-v3/include/tr1/cstdint
+++ b/libstdc++-v3/include/tr1/cstdint
@ -1,6 +1,6 @@
 // TR1 cstdint -*- C++ -*-

-// Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+// Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -42,6 +42,27 @@

 #include <bits/c++config.h>

+// For 8.22.1/1 (see C99, Notes 219, 220, 222)
+# if _GLIBCXX_HAVE_STDINT_H
+#  ifndef __STDC_LIMIT_MACROS
+#   define _UNDEF__STDC_LIMIT_MACROS
+#   define __STDC_LIMIT_MACROS
+#  endif
+#  ifndef __STDC_CONSTANT_MACROS
+#   define _UNDEF__STDC_CONSTANT_MACROS
+#   define __STDC_CONSTANT_MACROS
+#  endif
+#  include <stdint.h>
+#  ifdef _UNDEF__STDC_LIMIT_MACROS
+#   undef __STDC_LIMIT_MACROS
+#   undef _UNDEF__STDC_LIMIT_MACROS
+#  endif
+#  ifdef _UNDEF__STDC_CONSTANT_MACROS
+#   undef __STDC_CONSTANT_MACROS
+#   undef _UNDEF__STDC_CONSTANT_MACROS
+#  endif
+# endif
+
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  include <tr1_impl/cstdint>
 #else
--- a/libstdc++-v3/include/tr1_impl/cfenv
+++ b/libstdc++-v3/include/tr1_impl/cfenv
@ -1,6 +1,6 @@
 // TR1 cfenv -*- C++ -*-

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -36,8 +36,6 @@

 #if _GLIBCXX_USE_C99_FENV_TR1

-#include_next <fenv.h>
-
 #undef feclearexcept
 #undef fegetexceptflag
 #undef feraiseexcept
--- a/libstdc++-v3/include/tr1_impl/cinttypes
+++ b/libstdc++-v3/include/tr1_impl/cinttypes
@ -1,6 +1,6 @@
 // TR1 cinttypes -*- C++ -*-

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -36,10 +36,6 @@

 #if _GLIBCXX_USE_C99_INTTYPES_TR1

-// For 8.11.1/1 (see C99, Note 184) 
-#define __STDC_FORMAT_MACROS
-#include_next <inttypes.h>
-
 namespace std
 {
 _GLIBCXX_BEGIN_NAMESPACE_TR1
--- a/libstdc++-v3/include/tr1_impl/cstdint
+++ b/libstdc++-v3/include/tr1_impl/cstdint
@ -1,6 +1,6 @@
 // TR1 cstdint -*- C++ -*-

-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@ -36,11 +36,6 @@

 #if _GLIBCXX_USE_C99_STDINT_TR1

-// For 8.22.1/1 (see C99, Notes 219, 220, 222) 
-#define __STDC_LIMIT_MACROS
-#define __STDC_CONSTANT_MACROS
-#include_next <stdint.h>
-
 namespace std
 {
 _GLIBCXX_BEGIN_NAMESPACE_TR1