Revert include ordering.

2003-01-23  Benjamin Kosnik  <bkoz@redhat.com>

	Revert include ordering.
	* config/locale/generic/c_locale.h: Add include guards.
	* config/locale/gnu/c_locale.h: Same.
	* include/bits/locale_classes.h: Remove cctype include.
	* include/std/std_iosfwd.h: Add c++locale.h, cctype includes.
	* include/std/std_fstream.h: Remove streambuf include.
	* include/std/std_sstream.h: Remove streambuf include.

From-SVN: r61664

libstdc++-v3/ChangeLog

 2003-01-23  Benjamin Kosnik  <bkoz@redhat.com>
 
+	Revert include ordering.
+	* config/locale/generic/c_locale.h: Add include guards.
+	* config/locale/gnu/c_locale.h: Same.
+	* include/bits/locale_classes.h: Remove cctype include.
+	* include/std/std_iosfwd.h: Add c++locale.h, cctype includes.
+	* include/std/std_fstream.h: Remove streambuf include.
+	* include/std/std_sstream.h: Remove streambuf include.
+	
+2003-01-23  Benjamin Kosnik  <bkoz@redhat.com>
+
 	* configure.in (libtool_VERSION): To 6:0:0.
 	* configure: Regenerated.
 	* config/linker-map.gnu: Clean.

libstdc++-v3/config/locale/generic/c_locale.h

@@ -33,6 +33,11 @@
 
 // Written by Benjamin Kosnik <bkoz@redhat.com>
 
+#ifndef _CPP_BITS_C_LOCALE_H
+#define _CPP_BITS_C_LOCALE_H 1
+
+#pragma GCC system_header
+
 #include <clocale>
 
 #define _GLIBCPP_NUM_CATEGORIES 0
@@ -73,3 +78,5 @@ namespace std
       return __ret;
     }
 }
+
+#endif

libstdc++-v3/config/locale/gnu/c_locale.h

@@ -33,6 +33,11 @@
 
 // Written by Benjamin Kosnik <bkoz@redhat.com>
 
+#ifndef _CPP_BITS_C_LOCALE_H
+#define _CPP_BITS_C_LOCALE_H 1
+
+#pragma GCC system_header
+
 #include <clocale>
 #include <langinfo.h>		// For codecvt
 #include <iconv.h>		// For codecvt using iconv, iconv_t
@@ -96,3 +101,5 @@ namespace std
       return __ret;
     }
 }
+
+#endif

libstdc++-v3/include/bits/locale_classes.h

@@ -43,7 +43,6 @@
 #pragma GCC system_header
 
 #include <bits/localefwd.h>
-#include <cctype>		// For isspace, etc.
 #include <cstring>		// For strcmp.
 #include <string>
 #include <bits/atomicity.h>

libstdc++-v3/include/std/std_fstream.h

@@ -42,7 +42,6 @@
 
 #pragma GCC system_header
 
-#include <streambuf>
 #include <istream>
 #include <ostream>
 #include <locale>	// For codecvt

libstdc++-v3/include/std/std_iosfwd.h

@@ -43,6 +43,8 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
+#include <bits/c++locale.h> 
+#include <cctype>		// For isspace, etc.
 #include <bits/stringfwd.h> 	// For string forward declarations.
 #include <bits/fpos.h>
 #include <bits/functexcept.h>

libstdc++-v3/include/std/std_sstream.h

@@ -41,7 +41,6 @@
 
 #pragma GCC system_header
 
-#include <streambuf>
 #include <istream>
 #include <ostream>