compilation fix for iconv call

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 58e73178d68f5528f09c90b1a85331efc3a16427..00ab2fc8f51348f0d442a13e651583455fc91037 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1689,9 +1689,9 @@ size_t wxMBConv_iconv::GetMinMBCharWidth() const
         char buf[8]; // should be enough for NUL in any encoding
         size_t inLen = sizeof(wchar_t),
                outLen = WXSIZEOF(buf);
         char buf[8]; // should be enough for NUL in any encoding
         size_t inLen = sizeof(wchar_t),
                outLen = WXSIZEOF(buf);

-        const char *in = (char *)wnul;
+        char *in = (char *)wnul;

         char *out = buf;
         char *out = buf;

-        if ( iconv(w2m, &in, &inLen, &out, &outLen) == (size_t)-1 )
+        if ( iconv(w2m, ICONV_CHAR_CAST(&in), &inLen, &out, &outLen) == (size_t)-1 )

         {
             self->m_minMBCharWidth = (size_t)-1;
         }
         {
             self->m_minMBCharWidth = (size_t)-1;
         }