2003-07-04 Benjamin Kosnik <bkoz@redhat.com>

	Move from CPP to CXX.
	* include/bits/c++config: Move to GLIBCXX from GLIBCPP.
	* testsuite/Makefile.am: Same.
	* testsuite/Makefile.in: Regenerate.
	* po/Makefile.am: Same.
	* po/Makefile.in: Regenerate.
	* libsupc++/Makefile.am: Same.
	* libsupc++/Makefile.in: Regenerate.
	* libmath/Makefile.am: Same.
	* libmath/Makefile.in: Regenerate.
	* include/Makefile.am: Same.
	* include/Makefile.in: Regenerate.
	* src/Makefile.am: Same.
	* src/Makefile.in: Regenerate.
	* acconfig.h: Same.
	* configure.host: Same.
	* configure.in: Same.
	* configure: Regenerate.
	* acinclude.m4: Same.
	* aclocal.m4: Same.
	* src: Change all files in this directory.
	* testsuite: Same.
	* include: Same, standardize include guards.
	* config: Same.
	* libsupc++: Same.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68958 138bc75d-0d04-0410-961f-82ee72b054a4

17 files changed, 123 insertions, 123 deletions

diff --git a/libstdc++-v3/include/c_std/cmath.tcc b/libstdc++-v3/include/c_std/cmath.tcc
index 9b86bbb9da6..be7502d3c46 100644
--- a/libstdc++-v3/include/c_std/cmath.tcc
+++ b/libstdc++-v3/include/c_std/cmath.tcc
@@ -29,8 +29,8 @@
 
 // This file was written by Gabriel Dos Reis <gdr@codesourcery.com>
 
-#ifndef _CPP_BITS_CMATH_TCC
-#define _CPP_BITS_CMATH_TCC 1
+#ifndef _CMATH_TCC
+#define _CMATH_TCC 1
 
 namespace std 
 {
diff --git a/libstdc++-v3/include/c_std/std_cctype.h b/libstdc++-v3/include/c_std/std_cctype.h
index 4700809f3aa..8b903eaf76a 100644
--- a/libstdc++-v3/include/c_std/std_cctype.h
+++ b/libstdc++-v3/include/c_std/std_cctype.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CCTYPE
-#define _CPP_CCTYPE 1
+#ifndef _CCTYPE
+#define _CCTYPE 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cerrno.h b/libstdc++-v3/include/c_std/std_cerrno.h
index 7fcecd43917..b9a0743e79a 100644
--- a/libstdc++-v3/include/c_std/std_cerrno.h
+++ b/libstdc++-v3/include/c_std/std_cerrno.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CERRNO
-#define _CPP_CERRNO 1
+#ifndef _CERRNO
+#define _CERRNO 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cfloat.h b/libstdc++-v3/include/c_std/std_cfloat.h
index 3cc8d7218da..ab7283e7802 100644
--- a/libstdc++-v3/include/c_std/std_cfloat.h
+++ b/libstdc++-v3/include/c_std/std_cfloat.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CFLOAT
-#define _CPP_CFLOAT 1
+#ifndef _CFLOAT
+#define _CFLOAT 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_climits.h b/libstdc++-v3/include/c_std/std_climits.h
index 242913e60df..7f2b0125f23 100644
--- a/libstdc++-v3/include/c_std/std_climits.h
+++ b/libstdc++-v3/include/c_std/std_climits.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CLIMITS
-#define _CPP_CLIMITS	1
+#ifndef _CLIMITS
+#define _CLIMITS 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_clocale.h b/libstdc++-v3/include/c_std/std_clocale.h
index 66747d9244c..c6a882b6fe1 100644
--- a/libstdc++-v3/include/c_std/std_clocale.h
+++ b/libstdc++-v3/include/c_std/std_clocale.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CLOCALE
-#define _CPP_CLOCALE 1
+#ifndef _CLOCALE
+#define _CLOCALE 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cmath.h b/libstdc++-v3/include/c_std/std_cmath.h
index 04d300a01c6..b34e172167c 100644
--- a/libstdc++-v3/include/c_std/std_cmath.h
+++ b/libstdc++-v3/include/c_std/std_cmath.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CMATH
-#define _CPP_CMATH 1
+#ifndef _CMATH
+#define _CMATH 1
 
 #pragma GCC system_header
 
@@ -82,8 +82,8 @@ namespace __gnu_cxx
 {
   namespace  __c99_binding
   {
-#if _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_CHECK || \
-    _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC
+#if _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_CHECK || \
+    _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC
     extern "C" float (acosf)(float);
     extern "C" float (asinf)(float);
     extern "C" float (atanf)(float);
@@ -103,62 +103,62 @@ namespace __gnu_cxx
     extern "C" float (tanf)(float);
     extern "C" float (tanhf)(float);
 #endif
-#if !_GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC
-#if _GLIBCPP_HAVE_ACOSF
+#if !_GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC
+#if _GLIBCXX_HAVE_ACOSF
     using ::acosf;
 #endif
-#if _GLIBCPP_HAVE_ASINF
+#if _GLIBCXX_HAVE_ASINF
     using ::asinf;
 #endif
-#if _GLIBCPP_HAVE_ATANF
+#if _GLIBCXX_HAVE_ATANF
     using ::atanf;
 #endif
-#if _GLIBCPP_HAVE_ATAN2F
+#if _GLIBCXX_HAVE_ATAN2F
     using ::atan2f;
 #endif
-#if _GLIBCPP_HAVE_CEILF
+#if _GLIBCXX_HAVE_CEILF
     using ::ceilf;
 #endif
-#if _GLIBCPP_HAVE_COSHF
+#if _GLIBCXX_HAVE_COSHF
     using ::coshf;
 #endif
-#if _GLIBCPP_HAVE_EXPF
+#if _GLIBCXX_HAVE_EXPF
     using ::expf;
 #endif
-#if _GLIBCPP_HAVE_FLOORF
+#if _GLIBCXX_HAVE_FLOORF
     using ::floorf;
 #endif
-#if _GLIBCPP_HAVE_FMODF
+#if _GLIBCXX_HAVE_FMODF
     using ::fmodf;
 #endif
-#if _GLIBCPP_HAVE_FREXPF
+#if _GLIBCXX_HAVE_FREXPF
     using ::frexpf;
 #endif
-#if _GLIBCPP_HAVE_LDEXPF
+#if _GLIBCXX_HAVE_LDEXPF
     using ::ldexpf;
 #endif
-#if _GLIBCPP_HAVE_LOGF
+#if _GLIBCXX_HAVE_LOGF
     using ::logf;
 #endif
-#if _GLIBCPP_HAVE_LOG10F
+#if _GLIBCXX_HAVE_LOG10F
     using ::log10f;
 #endif
-#if _GLIBCPP_HAVE_MODFF
+#if _GLIBCXX_HAVE_MODFF
     using ::modff;
 #endif
-#if _GLIBCPP_HAVE_POWF
+#if _GLIBCXX_HAVE_POWF
     using ::powf;
 #endif
-#if _GLIBCPP_HAVE_SINHF
+#if _GLIBCXX_HAVE_SINHF
     using ::sinhf;
 #endif
-#if _GLIBCPP_HAVE_TANF
+#if _GLIBCXX_HAVE_TANF
     using ::tanf;
 #endif
-#if _GLIBCPP_HAVE_TANHF
+#if _GLIBCXX_HAVE_TANHF
     using ::tanhf;
 #endif
-#endif /* _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC */
+#endif /* _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC */
   }
 }
 
@@ -180,7 +180,7 @@ namespace std
   abs(long double __x)
   { return __builtin_fabsl(__x); }
 
-#if _GLIBCPP_HAVE_ACOSF
+#if _GLIBCXX_HAVE_ACOSF
   inline float 
   acos(float __x) { return __gnu_cxx::__c99_binding::acosf(__x); }
 #else
@@ -190,7 +190,7 @@ namespace std
 
   using ::acos;
   
-#if _GLIBCPP_HAVE_ACOSL
+#if _GLIBCXX_HAVE_ACOSL
   inline long double 
   acos(long double __x) { return ::acosl(__x); }
 #else
@@ -207,7 +207,7 @@ namespace std
   
   using ::asin;
 
-#if _GLIBCPP_HAVE_ASINF
+#if _GLIBCXX_HAVE_ASINF
   inline float 
   asin(float __x) { return __gnu_cxx::__c99_binding::asinf(__x); }
 #else
@@ -215,7 +215,7 @@ namespace std
   asin(float __x) { return ::asin(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_ASINL
+#if _GLIBCXX_HAVE_ASINL
   inline long double 
   asin(long double __x) { return ::asinl(__x); }
 #else
@@ -230,7 +230,7 @@ namespace std
 
   using ::atan;
 
-#if _GLIBCPP_HAVE_ATANF
+#if _GLIBCXX_HAVE_ATANF
   inline float 
   atan(float __x) { return __gnu_cxx::__c99_binding::atanf(__x); }
 #else
@@ -238,7 +238,7 @@ namespace std
   atan(float __x) { return ::atan(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_ATANL
+#if _GLIBCXX_HAVE_ATANL
   inline long double 
   atan(long double __x) { return ::atanl(__x); }
 #else
@@ -253,7 +253,7 @@ namespace std
   
   using ::atan2;
 
-#if _GLIBCPP_HAVE_ATAN2F
+#if _GLIBCXX_HAVE_ATAN2F
   inline float 
   atan2(float __y, float __x) { return __gnu_cxx::__c99_binding::atan2f(__y, __x); }
 #else
@@ -262,7 +262,7 @@ namespace std
   { return ::atan2(static_cast<double>(__y), static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_ATAN2L
+#if _GLIBCXX_HAVE_ATAN2L
   inline long double 
   atan2(long double __y, long double __x) { return ::atan2l(__y, __x); }
 #else
@@ -279,7 +279,7 @@ namespace std
 
   using ::ceil;
 
-#if _GLIBCPP_HAVE_CEILF
+#if _GLIBCXX_HAVE_CEILF
   inline float 
   ceil(float __x) { return __gnu_cxx::__c99_binding::ceilf(__x); }
 #else
@@ -287,7 +287,7 @@ namespace std
   ceil(float __x) { return ::ceil(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_CEILL
+#if _GLIBCXX_HAVE_CEILL
   inline long double 
   ceil(long double __x) { return ::ceill(__x); }
 #else
@@ -317,7 +317,7 @@ namespace std
 
   using ::cosh;
 
-#if _GLIBCPP_HAVE_COSHF
+#if _GLIBCXX_HAVE_COSHF
   inline float 
   cosh(float __x) { return __gnu_cxx::__c99_binding::coshf(__x); }
 #else
@@ -325,7 +325,7 @@ namespace std
   cosh(float __x) { return ::cosh(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_COSHL
+#if _GLIBCXX_HAVE_COSHL
   inline long double 
   cosh(long double __x) { return ::coshl(__x); }
 #else
@@ -340,7 +340,7 @@ namespace std
 
   using ::exp;
 
-#if _GLIBCPP_HAVE_EXPF
+#if _GLIBCXX_HAVE_EXPF
   inline float 
   exp(float __x) { return __gnu_cxx::__c99_binding::expf(__x); }
 #else
@@ -348,7 +348,7 @@ namespace std
   exp(float __x) { return ::exp(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_EXPL
+#if _GLIBCXX_HAVE_EXPL
   inline long double 
   exp(long double __x) { return ::expl(__x); }
 #else
@@ -378,7 +378,7 @@ namespace std
 
   using ::floor;
 
-#if _GLIBCPP_HAVE_FLOORF
+#if _GLIBCXX_HAVE_FLOORF
   inline float 
   floor(float __x) { return __gnu_cxx::__c99_binding::floorf(__x); }
 #else
@@ -386,7 +386,7 @@ namespace std
   floor(float __x) { return ::floor(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_FLOORL
+#if _GLIBCXX_HAVE_FLOORL
   inline long double 
   floor(long double __x) { return ::floorl(__x); }
 #else
@@ -401,7 +401,7 @@ namespace std
   
   using ::fmod;
 
-#if _GLIBCPP_HAVE_FMODF
+#if _GLIBCXX_HAVE_FMODF
   inline float 
   fmod(float __x, float __y) { return __gnu_cxx::__c99_binding::fmodf(__x, __y); }
 #else
@@ -410,7 +410,7 @@ namespace std
   { return ::fmod(static_cast<double>(__x), static_cast<double>(__y)); }
 #endif
 
-#if _GLIBCPP_HAVE_FMODL
+#if _GLIBCXX_HAVE_FMODL
   inline long double 
   fmod(long double __x, long double __y) { return ::fmodl(__x, __y); }
 #else
@@ -421,7 +421,7 @@ namespace std
 
   using ::frexp;
 
-#if _GLIBCPP_HAVE_FREXPF
+#if _GLIBCXX_HAVE_FREXPF
   inline float 
   frexp(float __x, int* __exp) { return __gnu_cxx::__c99_binding::frexpf(__x, __exp); }
 #else
@@ -429,7 +429,7 @@ namespace std
   frexp(float __x, int* __exp) { return ::frexp(__x, __exp); }
 #endif
 
-#if _GLIBCPP_HAVE_FREXPL
+#if _GLIBCXX_HAVE_FREXPL
   inline long double 
   frexp(long double __x, int* __exp) { return ::frexpl(__x, __exp); }
 #else
@@ -445,7 +445,7 @@ namespace std
   
   using ::ldexp;
 
-#if _GLIBCPP_HAVE_LDEXPF
+#if _GLIBCXX_HAVE_LDEXPF
   inline float 
   ldexp(float __x, int __exp) { return __gnu_cxx::__c99_binding::ldexpf(__x, __exp); }
 #else
@@ -454,7 +454,7 @@ namespace std
   { return ::ldexp(static_cast<double>(__x), __exp); }
 #endif
 
-#if _GLIBCPP_HAVE_LDEXPL
+#if _GLIBCXX_HAVE_LDEXPL
   inline long double 
   ldexp(long double __x, int __exp) { return ::ldexpl(__x, __exp); }
 #else
@@ -470,7 +470,7 @@ namespace std
 
   using ::log;
 
-#if _GLIBCPP_HAVE_LOGF
+#if _GLIBCXX_HAVE_LOGF
   inline float 
   log(float __x) { return __gnu_cxx::__c99_binding::logf(__x); }
 #else
@@ -478,7 +478,7 @@ namespace std
   { return ::log(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_LOGL
+#if _GLIBCXX_HAVE_LOGL
   inline long double 
   log(long double __x) { return ::logl(__x); }
 #else
@@ -493,7 +493,7 @@ namespace std
   
   using ::log10;
 
-#if _GLIBCPP_HAVE_LOG10F
+#if _GLIBCXX_HAVE_LOG10F
   inline float 
   log10(float __x) { return __gnu_cxx::__c99_binding::log10f(__x); }
 #else
@@ -501,7 +501,7 @@ namespace std
   log10(float __x) { return ::log10(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_LOG10L
+#if _GLIBCXX_HAVE_LOG10L
   inline long double 
   log10(long double __x) { return ::log10l(__x); }
 #else
@@ -516,7 +516,7 @@ namespace std
   
   using ::modf;
 
-#if _GLIBCPP_HAVE_MODFF
+#if _GLIBCXX_HAVE_MODFF
   inline float 
   modf(float __x, float* __iptr) { return __gnu_cxx::__c99_binding::modff(__x, __iptr); }
 #else
@@ -530,7 +530,7 @@ namespace std
   }
 #endif
 
-#if _GLIBCPP_HAVE_MODFL
+#if _GLIBCXX_HAVE_MODFL
   inline long double 
   modf(long double __x, long double* __iptr) { return ::modfl(__x, __iptr); }
 #else
@@ -555,7 +555,7 @@ namespace std
 
   using ::pow;
 
-#if _GLIBCPP_HAVE_POWF
+#if _GLIBCXX_HAVE_POWF
   inline float 
   pow(float __x, float __y) { return __gnu_cxx::__c99_binding::powf(__x, __y); }
 #else
@@ -564,7 +564,7 @@ namespace std
   { return ::pow(static_cast<double>(__x), static_cast<double>(__y)); }
 #endif
 
-#if _GLIBCPP_HAVE_POWL
+#if _GLIBCXX_HAVE_POWL
   inline long double 
   pow(long double __x, long double __y) { return ::powl(__x, __y); }
 #else
@@ -602,7 +602,7 @@ namespace std
 
   using ::sinh;
 
-#if _GLIBCPP_HAVE_SINHF
+#if _GLIBCXX_HAVE_SINHF
   inline float 
   sinh(float __x) { return __gnu_cxx::__c99_binding::sinhf(__x); }
 #else
@@ -610,7 +610,7 @@ namespace std
   sinh(float __x) { return ::sinh(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_SINHL
+#if _GLIBCXX_HAVE_SINHL
   inline long double 
   sinh(long double __x) { return ::sinhl(__x); }
 #else
@@ -640,7 +640,7 @@ namespace std
   
   using ::tan;
 
-#if _GLIBCPP_HAVE_TANF
+#if _GLIBCXX_HAVE_TANF
   inline float 
   tan(float __x) { return __gnu_cxx::__c99_binding::tanf(__x); }
 #else
@@ -648,7 +648,7 @@ namespace std
   tan(float __x) { return ::tan(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_TANL
+#if _GLIBCXX_HAVE_TANL
   inline long double 
   tan(long double __x) { return ::tanl(__x); }
 #else
@@ -663,7 +663,7 @@ namespace std
   
   using ::tanh;
 
-#if _GLIBCPP_HAVE_TANHF
+#if _GLIBCXX_HAVE_TANHF
   inline float 
   tanh(float __x) { return __gnu_cxx::__c99_binding::tanhf(__x); }
 #else
@@ -671,7 +671,7 @@ namespace std
   tanh(float __x) { return ::tanh(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_TANHL
+#if _GLIBCXX_HAVE_TANHL
   inline long double 
   tanh(long double __x) { return ::tanhl(__x); }
 #else
@@ -686,8 +686,8 @@ namespace std
 } 
 
 
-#if _GLIBCPP_USE_C99
-#if !_GLIBCPP_USE_C99_FP_MACROS_DYNAMIC
+#if _GLIBCXX_USE_C99
+#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
 // These are possible macros imported from C99-land. For strict
 // conformance, remove possible C99-injected names from the global
 // namespace, and sequester them in the __gnu_cxx extension namespace. 
@@ -760,11 +760,11 @@ namespace __gnu_cxx
 #undef islessequal
 #undef islessgreater
 #undef isunordered
-#endif /* _GLIBCPP_USE_C99_FP_MACROS_DYNAMIC */
+#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
 #endif
 
-#if _GLIBCPP_USE_C99
-#if !_GLIBCPP_USE_C99_FP_MACROS_DYNAMIC
+#if _GLIBCXX_USE_C99
+#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
 namespace __gnu_cxx
 {
   template<typename _Tp>
@@ -835,10 +835,10 @@ namespace std
   using __gnu_cxx::islessgreater;
   using __gnu_cxx::isunordered;
 }
-#endif /* _GLIBCPP_USE_C99_FP_MACROS_DYNAMIC */
+#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
 #endif
   
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 #  define export
 #  include <bits/cmath.tcc>
 #endif
diff --git a/libstdc++-v3/include/c_std/std_csetjmp.h b/libstdc++-v3/include/c_std/std_csetjmp.h
index f6df5815001..c5b9119e0b8 100644
--- a/libstdc++-v3/include/c_std/std_csetjmp.h
+++ b/libstdc++-v3/include/c_std/std_csetjmp.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSETJMP
-#define _CPP_CSETJMP 1
+#ifndef _CSETJMP
+#define _CSETJMP 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_csignal.h b/libstdc++-v3/include/c_std/std_csignal.h
index 1017161d63f..8be03f05f4c 100644
--- a/libstdc++-v3/include/c_std/std_csignal.h
+++ b/libstdc++-v3/include/c_std/std_csignal.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSIGNAL
-#define _CPP_CSIGNAL 1
+#ifndef _CSIGNAL
+#define _CSIGNAL 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cstdarg.h b/libstdc++-v3/include/c_std/std_cstdarg.h
index 9383adee9a5..52979dffa6c 100644
--- a/libstdc++-v3/include/c_std/std_cstdarg.h
+++ b/libstdc++-v3/include/c_std/std_cstdarg.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTDARG
-#define _CPP_CSTDARG 1
+#ifndef _CSTDARG
+#define _CSTDARG 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cstddef.h b/libstdc++-v3/include/c_std/std_cstddef.h
index 7a740afb398..b7e56100196 100644
--- a/libstdc++-v3/include/c_std/std_cstddef.h
+++ b/libstdc++-v3/include/c_std/std_cstddef.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTDDEF
-#define _CPP_CSTDDEF 1
+#ifndef _CSTDDEF
+#define _CSTDDEF 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cstdio.h b/libstdc++-v3/include/c_std/std_cstdio.h
index 3b4a6856739..732da5f9461 100644
--- a/libstdc++-v3/include/c_std/std_cstdio.h
+++ b/libstdc++-v3/include/c_std/std_cstdio.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTDIO
-#define _CPP_CSTDIO 1
+#ifndef _CSTDIO
+#define _CSTDIO 1
 
 #pragma GCC system_header
 
@@ -142,7 +142,7 @@ namespace std
   using ::vsprintf;
 }
 
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
 
 #undef snprintf
 #undef vfscanf
@@ -152,7 +152,7 @@ namespace std
 
 namespace __gnu_cxx
 {
-#if _GLIBCPP_USE_C99_CHECK || _GLIBCPP_USE_C99_DYNAMIC
+#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
   extern "C" int
     (snprintf)(char * restrict, size_t, const char * restrict, ...);
   extern "C" int
@@ -163,7 +163,7 @@ namespace __gnu_cxx
   extern "C" int
     (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list);
 #endif
-#if !_GLIBCPP_USE_C99_DYNAMIC
+#if !_GLIBCXX_USE_C99_DYNAMIC
   using ::snprintf;
   using ::vfscanf;
   using ::vscanf;
diff --git a/libstdc++-v3/include/c_std/std_cstdlib.h b/libstdc++-v3/include/c_std/std_cstdlib.h
index e1436be1d7a..5cac120edfd 100644
--- a/libstdc++-v3/include/c_std/std_cstdlib.h
+++ b/libstdc++-v3/include/c_std/std_cstdlib.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTDLIB
-#define _CPP_CSTDLIB 1
+#ifndef _CSTDLIB
+#define _CSTDLIB 1
 
 #pragma GCC system_header
 
@@ -122,7 +122,7 @@ namespace std
   div(long __i, long __j) { return ldiv(__i, __j); }
 } 
 
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
 
 #undef _Exit
 #undef llabs
@@ -135,13 +135,13 @@ namespace std
 
 namespace __gnu_cxx
 {
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   using ::lldiv_t;
 #endif
-#if _GLIBCPP_USE_C99_CHECK || _GLIBCPP_USE_C99_DYNAMIC
+#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
   extern "C" void (_Exit)(int);
 #endif
-#if !_GLIBCPP_USE_C99_DYNAMIC
+#if !_GLIBCXX_USE_C99_DYNAMIC
   using ::_Exit;
 #endif
 
@@ -151,7 +151,7 @@ namespace __gnu_cxx
   inline long long 
   llabs(long long __x) { return __x >= 0 ? __x : -__x; }
 
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   inline lldiv_t 
   div(long long __n, long long __d)
   { lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
@@ -161,14 +161,14 @@ namespace __gnu_cxx
   { lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
 #endif
 
-#if _GLIBCPP_USE_C99_LONG_LONG_CHECK || _GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   extern "C" long long int (atoll)(const char *);
   extern "C" long long int
     (strtoll)(const char * restrict, char ** restrict, int);
   extern "C" unsigned long long int
     (strtoull)(const char * restrict, char ** restrict, int);
 #endif
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   using ::atoll;
   using ::strtoll;
   using ::strtoull;
@@ -179,13 +179,13 @@ namespace __gnu_cxx
 
 namespace std
 {
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC 
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC 
   using __gnu_cxx::lldiv_t;
 #endif
   using __gnu_cxx::_Exit;
   using __gnu_cxx::abs;
   using __gnu_cxx::llabs; 
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC 
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC 
   using __gnu_cxx::div;
   using __gnu_cxx::lldiv;
 #endif
diff --git a/libstdc++-v3/include/c_std/std_cstring.h b/libstdc++-v3/include/c_std/std_cstring.h
index 066342aaaba..934e491def6 100644
--- a/libstdc++-v3/include/c_std/std_cstring.h
+++ b/libstdc++-v3/include/c_std/std_cstring.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTRING
-#define _CPP_CSTRING 1
+#ifndef _CSTRING
+#define _CSTRING 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_ctime.h b/libstdc++-v3/include/c_std/std_ctime.h
index 1b4c09b77cc..b7ed90698a2 100644
--- a/libstdc++-v3/include/c_std/std_ctime.h
+++ b/libstdc++-v3/include/c_std/std_ctime.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CTIME
-#define _CPP_CTIME 1
+#ifndef _CTIME
+#define _CTIME 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cwchar.h b/libstdc++-v3/include/c_std/std_cwchar.h
index 8b33c52282f..b9e0965ce8e 100644
--- a/libstdc++-v3/include/c_std/std_cwchar.h
+++ b/libstdc++-v3/include/c_std/std_cwchar.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CWCHAR
-#define _CPP_CWCHAR 1
+#ifndef _CWCHAR
+#define _CWCHAR 1
 
 #pragma GCC system_header
 
@@ -50,13 +50,13 @@
 #include <cstddef>
 #include <ctime>
 
-#if _GLIBCPP_HAVE_WCHAR_H
+#if _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>
 #endif
 
 // Need to do a bit of trickery here with mbstate_t as char_traits
 // assumes it is in wchar.h, regardless of wchar_t specializations.
-#ifndef _GLIBCPP_HAVE_MBSTATE_T
+#ifndef _GLIBCXX_HAVE_MBSTATE_T
 extern "C" 
 {
   typedef struct 
@@ -129,7 +129,7 @@ namespace std
 #undef wprintf
 #undef wscanf
 
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
 namespace std
 {
   using ::wint_t;
@@ -217,7 +217,7 @@ namespace std
   { return wmemchr(const_cast<const wchar_t*>(__p), __c, __n); }
 }
 
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
 
 #undef wcstold
 #undef wcstoll
@@ -225,20 +225,20 @@ namespace std
 
 namespace __gnu_cxx
 {
-#if _GLIBCPP_USE_C99_CHECK || _GLIBCPP_USE_C99_DYNAMIC
+#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
   extern "C" long double
     (wcstold)(const wchar_t * restrict, wchar_t ** restrict);
 #endif
-#if !_GLIBCPP_USE_C99_DYNAMIC
+#if !_GLIBCXX_USE_C99_DYNAMIC
   using ::wcstold;
 #endif
-#if _GLIBCPP_USE_C99_LONG_LONG_CHECK || _GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   extern "C" long long int
     (wcstoll)(const wchar_t * restrict, wchar_t ** restrict, int);
   extern "C" unsigned long long int
     (wcstoull)(const wchar_t * restrict, wchar_t ** restrict, int);
 #endif
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   using ::wcstoll;
   using ::wcstoull;
 #endif
@@ -252,6 +252,6 @@ namespace std
 }
 #endif
 
-#endif //_GLIBCPP_USE_WCHAR_T
+#endif //_GLIBCXX_USE_WCHAR_T
 
 #endif 
diff --git a/libstdc++-v3/include/c_std/std_cwctype.h b/libstdc++-v3/include/c_std/std_cwctype.h
index e469194aa19..f7639ed3843 100644
--- a/libstdc++-v3/include/c_std/std_cwctype.h
+++ b/libstdc++-v3/include/c_std/std_cwctype.h
@@ -41,14 +41,14 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CWCTYPE
-#define _CPP_CWCTYPE 1
+#ifndef _CWCTYPE
+#define _CWCTYPE 1
 
 #pragma GCC system_header
 
 #include <bits/c++config.h>
 
-#if _GLIBCPP_HAVE_WCTYPE_H
+#if _GLIBCXX_HAVE_WCTYPE_H
 #include <wctype.h>
 #endif
 
@@ -73,7 +73,7 @@
 #undef wctrans
 #undef wctype
 
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
 namespace std
 {
   using ::wint_t; 	  // cwchar
@@ -101,6 +101,6 @@ namespace std
   using ::wctrans;
   using ::wctype;
 }
-#endif //_GLIBCPP_USE_WCHAR_T
+#endif //_GLIBCXX_USE_WCHAR_T
 
 #endif