Mercurial > hg > octave-lojdl > gnulib-hg
changeset 13962:d08e3bdd07f9
wcsrtombs: Don't confuse mbstate_t with rpl_mbstate_t.
* lib/wcsrtombs.c: If gnulib overrides mbstate_t, define wcsrtombs
through wcrtomb.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 20 Dec 2010 11:18:11 +0100 |
| parents | c1bf409392b8 |
| children | e1862c329298 |
| files | ChangeLog lib/wcsrtombs.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-12-20 Bruno Haible <bruno@clisp.org> + + wcsrtombs: Don't confuse mbstate_t with rpl_mbstate_t. + * lib/wcsrtombs.c: If gnulib overrides mbstate_t, define wcsrtombs + through wcrtomb. + 2010-12-19 Paul Eggert <eggert@cs.ucla.edu> ftoastr: fix comment
--- a/lib/wcsrtombs.c +++ b/lib/wcsrtombs.c @@ -1,5 +1,5 @@ /* Convert wide string to string. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 2010 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ extern mbstate_t _gl_wcsrtombs_state; -#if HAVE_WCSRTOMBS && !WCSRTOMBS_TERMINATION_BUG +#if HAVE_WCSRTOMBS && !WCSRTOMBS_TERMINATION_BUG && !defined GNULIB_defined_mbstate_t /* Override the system's wcsrtombs() function. */ # undef wcsrtombs