diff options
| author | Benjamin Kosnik <bkoz@gnu.org> | 2000-10-05 05:54:07 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-10-05 05:54:07 +0000 |
| commit | e23062d5a741b3eba6bb8fc66bd0b99e759cd6cd (patch) | |
| tree | 43721a503abae2b8d356e7b610077214f07e8501 | |
| parent | 50503ac83dc9a1fbb9bf412ed33fafe9b326cedb (diff) | |
| download | gcc-e23062d5a741b3eba6bb8fc66bd0b99e759cd6cd.zip gcc-e23062d5a741b3eba6bb8fc66bd0b99e759cd6cd.tar.gz gcc-e23062d5a741b3eba6bb8fc66bd0b99e759cd6cd.tar.bz2 | |
_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
| -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 c80a8e9..223f0a6 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 0efe9e0..8ef42d4 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 36e5fea..a0415f6 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; |