libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 00:42:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix compilation when using ICONV_USES_CONST.

Browse Source 
svn-id: r49878
This commit is contained in:
Andre Heider 2010-06-15 17:50:14 +00:00
parent ee419aad9c
commit 212d0ac28c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/translation.cpp
View File

@ -129,27 +129,29 @@ String TranslationManager::getTranslation(const String &message) {
bool TranslationManager::convert(const char *message) {
// Preparing conversion origin
size_t len = strlen(message);
#ifdef ICONV_USES_CONST
const char *msg = message;
const char **pmsg = &msg;
#else
char *msgcpy = new char[len + 1];
strcpy(msgcpy, message);
char *msg = msgcpy;
#ifdef ICONV_USES_CONST
const char **pmsg = &msg;
#else
char **pmsg = &msg;
#endif
// Preparing conversion destination
size_t len2 = _sizeconv;
char *conv = _convmsg;
char **pconv = &conv;
// Clean previous conversions
iconv(_conversion, NULL, NULL, pconv, &len2);
iconv(_conversion, NULL, NULL, &conv, &len2);
// Do the real conversion
size_t result = iconv(_conversion, pmsg, &len, pconv, &len2);
size_t result = iconv(_conversion, pmsg, &len, &conv, &len2);
#ifndef ICONV_USES_CONST
delete[] msgcpy;
#endif
return result != ((size_t)-1);
}