diff options
| author | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-01 00:06:50 +0000 |
|---|---|---|
| committer | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-01 00:06:50 +0000 |
| commit | 43f006d8ddf2b64f2a7c4497902af8c20f5feaf1 (patch) | |
| tree | 05967d9b742b7bf3a4ee0b628081788918dbc505 | |
| parent | df3b4a51c4b969cadc5999249f1285ab4df163ef (diff) | |
| download | gcc-43f006d8ddf2b64f2a7c4497902af8c20f5feaf1.tar.gz | |
* include/c_std/bits/std_cstdlib.h (mblen): Protect against macro.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38574 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_std/bits/std_cstdlib.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a09e85f324d..6b657f900fc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2000-12-31 Alexandre Oliva <aoliva@redhat.com> + + * include/c_std/bits/std_cstdlib.h (mblen): Protect against macro. + 2000-12-23 Benjamin Kosnik <bkoz@redhat.com> * src/Makefile.am (CSTD_INCLUDES): Change from CSHADOW_INCLUDES. diff --git a/libstdc++-v3/include/c_std/bits/std_cstdlib.h b/libstdc++-v3/include/c_std/bits/std_cstdlib.h index a43c1c58b90..0cd0359167f 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstdlib.h +++ b/libstdc++-v3/include/c_std/bits/std_cstdlib.h @@ -85,6 +85,9 @@ namespace std extern "C" long int labs(long int); extern "C" div_t div(int, int); extern "C" ldiv_t ldiv(long int, long int); +#ifdef mblen +#undef mblen +#endif extern "C" int mblen(const char*, size_t); extern "C" int mbtowc(wchar_t*, const char*, size_t); extern "C" int wctomb(char*, wchar_t); |