# HG changeset patch # User rubidium # Date 2009-09-08 21:43:47 # Node ID 8de6a4ba1470f4ec457fe219d6e2de7f9ee36d5b # Parent ae7a5b5bb9c2d776f1c1fc61a06ed4c19c00e8c0 (svn r17479) -Fix: silence compile warning that's only triggered when you're using a broken iconv. diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp --- a/src/os/unix/unix.cpp +++ b/src/os/unix/unix.cpp @@ -141,11 +141,10 @@ static const char *GetLocalCode() #endif } -/** FYI: This is not thread-safe. - * convert between locales, which from and which to is set in the calling - * functions OTTD2FS() and FS2OTTD(). You should NOT use this function directly - * NOTE: iconv was added in OSX 10.3. 10.2.x will still have the invalid char - * issues. There aren't any easy fix for this */ +/** + * Convert between locales, which from and which to is set in the calling + * functions OTTD2FS() and FS2OTTD(). + */ static const char *convert_tofrom_fs(iconv_t convd, const char *name) { static char buf[1024]; @@ -153,7 +152,7 @@ static const char *convert_tofrom_fs(ico * non-const. Correct implementation is at * http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html */ #ifdef HAVE_BROKEN_ICONV - char *inbuf = (char*)name; + char *inbuf = const_cast(name); #else const char *inbuf = name; #endif