faster portsetting backpatched

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 9efed8b554eeeb09065f389104c0f77a7e27d8cf..b872663c75ee3108fe8496bc11913e76c5b9aa57 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -513,6 +513,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
         }
     }
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
+    (void)convertEncoding; // get rid of warnings about unused parameter
 }
 
 wxString wxMsgCatalogFile::GetCharset() const
@@ -1383,7 +1384,7 @@ wxString wxLocale::GetSystemEncodingName()
     // to Unix98)
     char *oldLocale = strdup(setlocale(LC_CTYPE, NULL));
     setlocale(LC_CTYPE, "");
-    char *alang = nl_langinfo(CODESET);
+    const char *alang = nl_langinfo(CODESET);
     setlocale(LC_CTYPE, oldLocale);
     free(oldLocale);