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

3 files changed, 11 insertions, 11 deletions

diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
index 1c03e4df29e..15ea686141e 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
@@ -25,7 +25,7 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-#if _GLIBCPP_USE___ENC_TRAITS
+#if _GLIBCXX_USE___ENC_TRAITS
 typedef std::codecvt<char, char, std::mbstate_t> 	      c_codecvt;
 typedef std::codecvt_byname<char, char, std::mbstate_t>       c_codecvt_byname;
 typedef std::codecvt<wchar_t, char, std::mbstate_t>	      w_codecvt;
@@ -287,11 +287,11 @@ void test01()
     VERIFY (loc15 != loc09);  
   }
 }
-#endif // _GLIBCPP_USE___ENC_TRAITS
+#endif // _GLIBCXX_USE___ENC_TRAITS
 
 int main()
 {
-#if _GLIBCPP_USE___ENC_TRAITS
+#if _GLIBCXX_USE___ENC_TRAITS
   test01();
 #endif 
   return 0;
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc
index f20542a137c..f6fc08adaf3 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc
@@ -29,7 +29,7 @@
 void test03()
 {
   bool test = true;
-#ifdef _GLIBCPP_HAVE_SETENV 
+#ifdef _GLIBCXX_HAVE_SETENV 
   const char* LC_ALL_orig = getenv("LC_ALL");
   if (!setenv("LC_ALL", "it_IT", 1))
     {
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
index 55ace6eaf82..c24f6a42a79 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
@@ -31,7 +31,7 @@ void test04()
   bool test = true;
   using namespace std;
 
-#ifdef _GLIBCPP_HAVE_SETENV
+#ifdef _GLIBCXX_HAVE_SETENV
 
   const char* LANG_orig = getenv("LANG") ? strdup(getenv("LANG")) : "";
   const char* LC_ALL_orig = getenv("LC_ALL") ? strdup(getenv("LC_ALL")) : "";
@@ -47,7 +47,7 @@ void test04()
     getenv("LC_MONETARY") ? strdup(getenv("LC_MONETARY")) : "";
   const char* LC_MESSAGES_orig = 
     getenv("LC_MESSAGES") ? strdup(getenv("LC_MESSAGES")) : "";
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
   const char* LC_PAPER_orig = 
     getenv("LC_PAPER") ? strdup(getenv("LC_PAPER")) : "";
   const char* LC_NAME_orig = 
@@ -100,7 +100,7 @@ void test04()
   setenv("LC_COLLATE", "", 1);
   setenv("LC_MONETARY", "", 1);
   setenv("LC_MESSAGES", "", 1);
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
   setenv("LC_PAPER", "", 1);
   setenv("LC_NAME", "", 1);
   setenv("LC_ADDRESS", "", 1);
@@ -128,7 +128,7 @@ void test04()
     {
       locale loc = __gnu_cxx_test::try_named_locale("");
 
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
       VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=C;"
               "LC_COLLATE=de_DE;LC_MONETARY=C;LC_MESSAGES=C;LC_PAPER=C;"
 	      "LC_NAME=C;LC_ADDRESS=C;LC_TELEPHONE=C;LC_MEASUREMENT=C;"
@@ -143,7 +143,7 @@ void test04()
   if (!setenv("LANG", "fr_FR", 1))
     {
       locale loc = __gnu_cxx_test::try_named_locale("");
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
       VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;"
 	      "LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;"
 	      "LC_MESSAGES=fr_FR;LC_PAPER=fr_FR;LC_NAME=fr_FR;"
@@ -157,7 +157,7 @@ void test04()
     }
   
   // Changing another (C only) category.
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
   if (!setenv("LC_IDENTIFICATION", "it_IT", 1))
     {
       locale loc = __gnu_cxx_test::try_named_locale("");
@@ -178,7 +178,7 @@ void test04()
   setenv("LC_COLLATE", LC_COLLATE_orig ? LC_COLLATE_orig : "", 1);
   setenv("LC_MONETARY", LC_MONETARY_orig ? LC_MONETARY_orig : "", 1);
   setenv("LC_MESSAGES", LC_MESSAGES_orig ? LC_MESSAGES_orig : "", 1);
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
   setenv("LC_PAPER", LC_PAPER_orig ? LC_PAPER_orig : "", 1);
   setenv("LC_NAME", LC_NAME_orig ? LC_NAME_orig : "", 1);
   setenv("LC_ADDRESS", LC_ADDRESS_orig ? LC_ADDRESS_orig : "", 1);