ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deal with iconv prototype changing with versions (hopefully right this time)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4416 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-01-08 01:36:15 +00:00
parent bba70f8c5a
commit 0f964187fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/translation.cpp
View File

@ -59,7 +59,7 @@ const char* CODE_NAMES[] =
* This code is assuming the iconv call for initializing the state * This code is assuming the iconv call for initializing the state
* won't fail due to lack of space in the output buffer. * won't fail due to lack of space in the output buffer.
*/ */
#if _LIBICONV_VERSION < 0x010B #if defined(__APPLE__) && _LIBICONV_VERSION < 0x010B
#define INIT_SHIFT_STATE(cd, fptr, ileft, tptr, oleft) \ #define INIT_SHIFT_STATE(cd, fptr, ileft, tptr, oleft) \
{ \ { \
fptr = NULL; \ fptr = NULL; \
@ -103,7 +103,7 @@ bool convertToEncoding(const char* from, char* to, const int BUF_SIZE, const cha
tptr = to; tptr = to;
oleft = BUFSIZ; oleft = BUFSIZ;
#if _LIBICONV_VERSION < 0x010B #if defined(__APPLE__) && _LIBICONV_VERSION < 0x010B
ret = iconv(cd, &fptr, &ileft, &tptr, &oleft); ret = iconv(cd, &fptr, &ileft, &tptr, &oleft);
#else #else
ret = iconv(cd, const_cast<char**>(&fptr), &ileft, &tptr, &oleft); ret = iconv(cd, const_cast<char**>(&fptr), &ileft, &tptr, &oleft);