[bug-gnu-libiconv] C's mbstate_t is different from C++ std::mbstate_t

[Pedro Giffuni]

Hello;

I got tired of having to work around this problem in my system
(FreeBSD 9.2) everytime I use xml2 from C++ (OpenOffice):

[ build CXX ] unoxml/source/dom/element
In file included from /usr/local/include/libxml2/libxml/encoding.h:28,
                 from /usr/local/include/libxml2/libxml/parser.h:807,
                 from /usr/local/include/libxml2/libxml/globals.h:18,
                 from /usr/local/include/libxml2/libxml/threads.h:35,
                 from /usr/local/include/libxml2/libxml/xmlmemory.h:218,
                 from /usr/local/include/libxml2/libxml/tree.h:1248,
                 from 
/usr/ports/editors/openoffice-devel/work/ooo/main/unoxml/source/dom/node.hxx:29,
                 from 
/usr/ports/editors/openoffice-devel/work/ooo/main/unoxml/source/dom/node.cxx:24:
/usr/local/include/iconv.h:123: error: 'mbstate_t' does not name a type

The problem seems to be that when using C++ it is important to include
<cwchar> instead of <wchar.h>

The following simple patch may be a little rough but it works.

regards,

Pedro.

patch-include_iconv.h.in
Description: Text document