This way strconv copmiles again. I don't think

    this is the intended use of ICONV_CONST, though.

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index f1d4c56ea2c2567c793fa0e3c7131101ad544b68..e1d49bd9fbeb83474f173060fc91235804c61057 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -506,7 +506,11 @@ public:
 #define ICONV_FAILED(cres, bufLeft)  (cres == (size_t)-1)
 #endif
 
-#define ICONV_CHAR_CAST(x)  ((ICONV_CONST char **)(x))
+#if ICONV_CONST
+#define ICONV_CHAR_CAST(x)  ((char **)(x))
+#else
+#define ICONV_CHAR_CAST(x)  ((const char **)(x))
+#endif
 
 // ----------------------------------------------------------------------------
 // IC_CharSet: encapsulates an iconv character set