From 0cd67d466d51055ba258f863e8728d6a1749e93e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 20 Dec 2010 11:18:11 +0100 Subject: [PATCH] wcsrtombs: Don't confuse mbstate_t with rpl_mbstate_t. * lib/wcsrtombs.c: If gnulib overrides mbstate_t, define wcsrtombs through wcrtomb. --- ChangeLog | 6 ++++++ lib/wcsrtombs.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9796a9bee..3c4b1e91c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-12-20 Bruno Haible + + 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 ftoastr: fix comment diff --git a/lib/wcsrtombs.c b/lib/wcsrtombs.c index e995a9ce4..ac27e5dba 100644 --- 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 , 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 -- 2.11.0