Skip to content

Commit

Permalink
COMMON: Make use of ICONV_CONST
Browse files Browse the repository at this point in the history
Is #define'd "const" if the iconv() implementation is of type
size_t iconv(iconv_t, const char **, size_t, char **, size_t)
instead of
size_t iconv(iconv_t, char **, size_t, char **, size_t).

This is apparently the case for FreeBSD and PPC-based Mac OS X.
  • Loading branch information
DrMcCoy committed Jul 6, 2013
1 parent 96cb985 commit ae155fb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/common/ustring.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class ConversionManager : public Singleton<ConversionManager> {
iconv(_fromLatin9, 0, 0, 0, 0);

// Convert
if (iconv(_fromLatin9, (char **) &data, &inBytes, (char **) &outBuf, &outBytes) == ((size_t) -1))
if (iconv(_fromLatin9, (ICONV_CONST char **) &data, &inBytes, (char **) &outBuf, &outBytes) == ((size_t) -1))
warning("Failed completely converting a latin9 string");

// And this should be our converted string
Expand Down

0 comments on commit ae155fb

Please sign in to comment.