Module Name: xsrc
Committed By: mrg
Date: Sat Nov 20 23:45:58 UTC 2010
Modified Files:
xsrc/external/mit/xwininfo/dist: xwininfo.c
Log Message:
avoid an mismatch between iconv(3)'s 2nd arg.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xwininfo/dist/xwininfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xwininfo/dist/xwininfo.c
diff -u xsrc/external/mit/xwininfo/dist/xwininfo.c:1.1.1.4 xsrc/external/mit/xwininfo/dist/xwininfo.c:1.2
--- xsrc/external/mit/xwininfo/dist/xwininfo.c:1.1.1.4 Sat Nov 20 23:18:52 2010
+++ xsrc/external/mit/xwininfo/dist/xwininfo.c Sat Nov 20 23:45:58 2010
@@ -1911,7 +1911,7 @@
char *outp = convbuf;
size_t outlen = sizeof(convbuf);
- convres = iconv (iconv_from_utf8, &inp, &inlen, &outp, &outlen);
+ convres = iconv (iconv_from_utf8, (const char **)&inp, &inlen, &outp, &outlen);
if ((convres == -1) && (errno == E2BIG)) {
done = False;
