_G_config.h: Re-guard the __mbstate_t declaration.

2000-10-04  Benjamin Kosnik  <bkoz@gnu.org>

	* libio/_G_config.h : Re-guard the __mbstate_t declaration.

From-SVN: r36716

libstdc++-v3/ChangeLog

+2000-10-04  Benjamin Kosnik  <bkoz@gnu.org>
+
+	* libio/_G_config.h : Re-guard the __mbstate_t declaration.
+
 2000-10-03  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
 
 	* docs/22_locale/howto.html: Add link to proto-documentation on

libstdc++-v3/libio/ChangeLog

-2000-09-27  benjamin kosnik  <bkoz@haight.constant.com>
+2000-10-04  Benjamin Kosnik  <bkoz@gnu.org>
+
+	* _G_config.h : Re-guard the __mbstate_t declaration.
+
+2000-09-27  Benjamin Kosnik  <bkoz@gnu.org>
 
 	* libioP.h: Remove fcntl.h include.
 

libstdc++-v3/libio/_G_config.h

@@ -30,7 +30,8 @@ typedef unsigned int wint_t;
 
 /* For use as part of glibc (native) or as part of libstdc++ (maybe
    not glibc) */
-#if __GLIBC__ < 2 || (__GLIBC__ == 2  && __GLIBC_MINOR__ <= 1)
+#ifndef __mbstate_t_defined
+# define __mbstate_t_defined	1
 # ifdef _GLIBCPP_USE_WCHAR_T
 typedef struct
 {
@@ -39,6 +40,7 @@ typedef struct
 }__mbstate_t;
 # endif
 #endif
+#undef __need_mbstate_t
 
 typedef size_t _G_size_t;
 
@@ -49,6 +51,7 @@ typedef struct
   __off_t __pos;
   __mbstate_t __state;
 } _G_fpos_t;
+
 typedef struct
 {
   __off64_t __pos;