re PR libstdc++/38000 (System header files not found once -isystem /usr/include is...

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: r141812

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 52b121add777b2daac8d13288d6384f692cce70a..4fdec55c266910d73238330adf877d680d4fc927 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,39 @@
+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-11-12  Steve Ellcey  <sje@cup.hp.com>
 
        * configure.ac: Move call to GCC_CHECK_UNWIND_GETIPINFO.

diff --git a/libstdc++-v3/include/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
index 44661d72c02f762d7e338531c005c23190e5c334..f24a217b8f57ecc28fa6ddaf373fcf53d69443e3 100644 (file)
--- 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.
  */
 
+#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__
-# include <cfenv>
-#else
-# if _GLIBCXX_HAVE_FENV_H
-#  include_next <fenv.h>
-# 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/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
 
-#ifndef _GLIBCXX_FENV_H
-#define _GLIBCXX_FENV_H 1
-
-#endif
+#endif // _GLIBCXX_FENV_H

diff --git a/libstdc++-v3/include/c_compatibility/inttypes.h b/libstdc++-v3/include/c_compatibility/inttypes.h
index 562d0aa90633de9454215e05b3ae06c56a620336..3e722d46acf4c5c97baa779ef79c8a7650fac2bb 100644 (file)
--- 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.
  */
 
+#ifndef _GLIBCXX_INTTYPES_H
+#define _GLIBCXX_INTTYPES_H 1
+
+#pragma GCC system_header
+
 #include <bits/c++config.h>
 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
-# include <cinttypes>
+
+// 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
 
-#ifndef _GLIBCXX_INTTYPES_H
-#define _GLIBCXX_INTTYPES_H 1
+#endif // __GXX_EXPERIMENTAL_CXX0X__
 
-#endif
+#endif // _GLIBCXX_INTTYPES_H

diff --git a/libstdc++-v3/include/c_compatibility/math.h b/libstdc++-v3/include/c_compatibility/math.h
index 69dc82ac5141def366533db01867416009dcdaa4..5950bf87a70dae5a75c374a8d39138acb27c2695 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_compatibility/stdint.h b/libstdc++-v3/include/c_compatibility/stdint.h
index c59a1cd76db0daeb12da3fa662b7dac0d7ce559f..e2cb038ba948d49090d9b3d65f1d314229f179cb 100644 (file)
--- 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.
  */
 
+#ifndef _GLIBCXX_STDINT_H
+#define _GLIBCXX_STDINT_H 1
+
+#pragma GCC system_header
+
 #include <bits/c++config.h>
 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
-# include <cstdint>
+
+// 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
 
-#ifndef _GLIBCXX_STDINT_H
-#define _GLIBCXX_STDINT_H 1
+#endif // __GXX_EXPERIMENTAL_CXX0X__
 
-#endif
+#endif // _GLIBCXX_STDINT_H

diff --git a/libstdc++-v3/include/c_global/cassert b/libstdc++-v3/include/c_global/cassert
index 6322b4fb360fd1aafcfb8072cc6ba824d0ee2f63..e821a48367a7da2b26a5e2c95db9bd8806444303 100644 (file)
--- 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>

diff --git a/libstdc++-v3/include/c_global/cctype b/libstdc++-v3/include/c_global/cctype
index 440245ec39fc236842e1c38ddb8d6498e5e49369..0c38611ace30d3f31fccfde53cd641d74ec95d9e 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cerrno b/libstdc++-v3/include/c_global/cerrno
index b7673668aaf2bca45e8c43c5caa8e1d4ef016999..7f2259657f5d1d19e59a0617a3f1bb6201111bd8 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
index de72ed43ace36c196a2101164a6349829f5cc2d2..b45d87fc31b31c5aeb4a2378f15cf79ae641a113 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cfloat b/libstdc++-v3/include/c_global/cfloat
index a3edc2acd73bef2b125e76761154309af805cc9f..10f75ba85963d5ea33c11b4d4332ed14d9d24c9c 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cinttypes b/libstdc++-v3/include/c_global/cinttypes
index 8caceafb48bb39a462234849563dcc9a6603b3e1..ca00d10e7a946ed051facdcee275745cf8749d02 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/climits b/libstdc++-v3/include/c_global/climits
index 87f585d489a304f4593feb870dcb33f58a977e8f..2cd5ee001190b44f0a5b178a5e748d09681fe20d 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/clocale b/libstdc++-v3/include/c_global/clocale
index 7feac30975e518e71c50d93f31edda30dcf52949..97242a4bbf66123de0d6e0edb452e89cdc56f82c 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath
index dd26db1a718795841e578de2dcdff603ec14f3b7..2009e5c87ca70ddb9d5028596b1215912046c195 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/csetjmp b/libstdc++-v3/include/c_global/csetjmp
index 3c2863475cb37f12f2746836480f2ce1fa321530..a44d1ebe4e3e68f1c2297112b424e310c4684695 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/csignal b/libstdc++-v3/include/c_global/csignal
index cf89c5abfaa381d6f2586b7456d6fc42b87673dd..b149831a7f484081a558653be9f815dde692accf 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cstdarg b/libstdc++-v3/include/c_global/cstdarg
index 21b4f7a2bb0cd99043876d2bb025cb7681763359..1c10ee6931a45c27524e29f55fbe1dbc35205999 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cstdbool b/libstdc++-v3/include/c_global/cstdbool
index 28dfa76abb8fe3428f8e271aeb388d4d004d716e..fc6ef9d0a93f841315d2deefb2f54666ae59ede1 100644 (file)
--- 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
 

diff --git a/libstdc++-v3/include/c_global/cstddef b/libstdc++-v3/include/c_global/cstddef
index 5196aeb9e81483b61d4ff46f764b3b96ec547177..8b8433020664990fdf4eea394bb0a8294d11cfba 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cstdint b/libstdc++-v3/include/c_global/cstdint
index 6c3f438c0a61e4b5a4d94efab622d0e7876efca5..23e238f601bf956a5ae81514022d70c0d4a518d1 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio
index 3cdb5d6a258a811420fadf60431c35238c3ebb0a..7c4a38bc4ab238619edc41aa6553cd988a3e2bc0 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cstdlib b/libstdc++-v3/include/c_global/cstdlib
index 3386ff0abc1faa9eddb64bc5066ed59ff6efb8e8..e03fff61882044aeff60a7caf6857b6f04f75ece 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cstring b/libstdc++-v3/include/c_global/cstring
index c41df692cdf1932b7a896cc9a337dc808ab737f8..9ad0683422f26c3ebb7bd8ded426367da41cf885 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/ctime b/libstdc++-v3/include/c_global/ctime
index 915c2fc663f5ddb0b48aad09b9f605bd72f0a74e..1fd67ad238c9bdd6bcf95739428ef43eb4ccafe9 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cwchar b/libstdc++-v3/include/c_global/cwchar
index 92bca61edf0472f1c82e1bcfa609fe45dbc28a0d..48b901ddd61e968f0e9ea9b178faf82e6ad8296b 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/c_global/cwctype b/libstdc++-v3/include/c_global/cwctype
index d2f2d779fbc989dd2085ec0bf6800eab713d1d53..c822ebb26cbaf182ca059184aef30063731e57e5 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/tr1/cfenv b/libstdc++-v3/include/tr1/cfenv
index 85447125decd06a8dc2e176c5e23b1ec935c4e94..1bdd099d480716bee9f7f8f303e3c810f177bf3e 100644 (file)
--- 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>

diff --git a/libstdc++-v3/include/tr1/cinttypes b/libstdc++-v3/include/tr1/cinttypes
index 19e2df32386db783f1d1b8887989d95bfe189160..a0857b49c16468569842e1bc5ee12e7b1b18ae8b 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/tr1/cstdbool b/libstdc++-v3/include/tr1/cstdbool
index 5f6e80eae9edfaab4003ae809d9aeafb903b1a9e..4fa8ddcded9a267aac2c0f0c9090c7f24c711af3 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/tr1/cstdint b/libstdc++-v3/include/tr1/cstdint
index 6f7ac763c8c06bfba40c96499e4fb680721d0402..04f86ad1cfa6ff4365c6190b98045211617994ac 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/tr1_impl/cfenv b/libstdc++-v3/include/tr1_impl/cfenv
index 4a1eca99d4afc9cf2f30f5dfadc20340019caa6f..2732322977f6d428fd9fb31dda90f4cc6c641d2b 100644 (file)
--- 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

diff --git a/libstdc++-v3/include/tr1_impl/cinttypes b/libstdc++-v3/include/tr1_impl/cinttypes
index a6b74355483c91a4a659c6af4bb758256e38e597..4e9da08abff8ba1d543849d18fe0cf965c21d9d1 100644 (file)
--- a/libstdc++-v3/include/tr1_impl/cinttypes
+++ b/libstdc++-v3/include/tr1_impl/cinttypes
@@ -36,17 +36,6 @@
 
 #if _GLIBCXX_USE_C99_INTTYPES_TR1
 
-// For 8.11.1/1 (see C99, Note 184)
-#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
-
 namespace std
 {
 _GLIBCXX_BEGIN_NAMESPACE_TR1

diff --git a/libstdc++-v3/include/tr1_impl/cstdint b/libstdc++-v3/include/tr1_impl/cstdint
index 7ba2fa0eb71ac15fc577c548d6fc71dd729dd92a..0c63fb4d367ada35aaa1ce71c8415a7b42d19e1e 100644 (file)
--- a/libstdc++-v3/include/tr1_impl/cstdint
+++ b/libstdc++-v3/include/tr1_impl/cstdint
@@ -36,25 +36,6 @@
 
 #if _GLIBCXX_USE_C99_STDINT_TR1
 
-// For 8.22.1/1 (see C99, Notes 219, 220, 222)
-#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
-
 namespace std
 {
 _GLIBCXX_BEGIN_NAMESPACE_TR1