diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-05 05:54:07 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-05 05:54:07 +0000 |
| commit | 5e0bc83fe6ffedc565a20311a87d4a55a70062eb (patch) | |
| tree | 43721a503abae2b8d356e7b610077214f07e8501 | |
| parent | a1415e6dd820bb7d4d4ae813a0491707a533a843 (diff) | |
| download | ppe42-gcc-5e0bc83fe6ffedc565a20311a87d4a55a70062eb.tar.gz ppe42-gcc-5e0bc83fe6ffedc565a20311a87d4a55a70062eb.zip | |
2000-10-04 Benjamin Kosnik <bkoz@gnu.org>
* libio/_G_config.h : Re-guard the __mbstate_t declaration.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36716 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/libio/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/libio/_G_config.h | 9 |
3 files changed, 15 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c80a8e95a17..223f0a62db4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +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 diff --git a/libstdc++-v3/libio/ChangeLog b/libstdc++-v3/libio/ChangeLog index 0efe9e044bf..8ef42d4a249 100644 --- a/libstdc++-v3/libio/ChangeLog +++ b/libstdc++-v3/libio/ChangeLog @@ -1,4 +1,8 @@ -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. diff --git a/libstdc++-v3/libio/_G_config.h b/libstdc++-v3/libio/_G_config.h index 36e5feac8bc..a0415f6482c 100644 --- a/libstdc++-v3/libio/_G_config.h +++ b/libstdc++-v3/libio/_G_config.h @@ -30,15 +30,17 @@ 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 { - int count; - wint_t value; + int count; + wint_t value; }__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; |
