From 2c4c6b4fe17326c8440de0f206165c0d1f11f985 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 25 Dec 2010 12:49:36 +0000 Subject: (svn r21634) -Codechange: apparantly the "broken" iconv interface is the new official interface, so update the variable/definition naming slightly as it's not broken just different from the earlier iconv interface --- src/os/unix/unix.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/os/unix/unix.cpp') diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp index cec912bec..61a2b9f39 100644 --- a/src/os/unix/unix.cpp +++ b/src/os/unix/unix.cpp @@ -151,10 +151,10 @@ static const char *GetLocalCode() static const char *convert_tofrom_fs(iconv_t convd, const char *name) { static char buf[1024]; - /* Work around buggy iconv implementation where inbuf is wrongly typed as - * non-const. Correct implementation is at - * http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html */ -#ifdef HAVE_BROKEN_ICONV + /* There are different implementations of iconv. The older ones, + * e.g. SUSv2, pass a const pointer, whereas the newer ones, e.g. + * IEEE 1003.1 (2004), pass a non-const pointer. */ +#ifdef HAVE_NON_CONST_ICONV char *inbuf = const_cast(name); #else const char *inbuf = name; -- cgit v1.2.3-70-g09d2