wcsrtombs: Don't confuse mbstate_t with rpl_mbstate_t.

* lib/wcsrtombs.c: If gnulib overrides mbstate_t, define wcsrtombs
through wcrtomb.

diff --git a/ChangeLog b/ChangeLog
index 9796a9bee24c1f47792483024180dea1264b139f..3c4b1e91c0642e302b37278b40c123d1ee9b23be 100644 (file)
--- 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

diff --git a/lib/wcsrtombs.c b/lib/wcsrtombs.c
index e995a9ce442313961595d08ddff7f7b93bb25097..ac27e5dbaec8cd7d5f5adebcf3b52944fe645948 100644 (file)
--- 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