vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Mar 19 23:01:34 2012 +0200| [06af246c3c1ec86d90f1673de4703bd60e2bae0d] | committer: Rémi Denis-Courmont
Pure C++ joy > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06af246c3c1ec86d90f1673de4703bd60e2bae0d --- include/vlc_charset.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vlc_charset.h b/include/vlc_charset.h index 28fe847..013c2f5 100644 --- a/include/vlc_charset.h +++ b/include/vlc_charset.h @@ -66,7 +66,7 @@ VLC_USED static inline const char *ToLocale (const char *utf8) { size_t outsize; - return utf8 ? ToCharset ("", utf8, &outsize) : NULL; + return utf8 ? (char *)ToCharset ("", utf8, &outsize) : (char *)NULL; } # define LocaleFree(s) free((char *)(s)) # define FromLocaleDup FromLocale _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
