aboutsummaryrefslogtreecommitdiffstats
path: root/log.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-11-20 18:17:48 +0000
committerWayne Davison <wayned@samba.org>2006-11-20 18:17:48 +0000
commit60d465dbdd95d813b322c19ce00b145ee37cb722 (patch)
tree4c245a94b114439ab11084aa7aad1f5eaebba102 /log.c
parent3ebdd3c7fc6a3c5845edda4b9a7e177883e6f4ac (diff)
downloadandroid_external_rsync-60d465dbdd95d813b322c19ce00b145ee37cb722.tar.gz
android_external_rsync-60d465dbdd95d813b322c19ce00b145ee37cb722.tar.bz2
android_external_rsync-60d465dbdd95d813b322c19ce00b145ee37cb722.zip
Use the new ICONV_CONST definition.
Diffstat (limited to 'log.c')
-rw-r--r--log.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/log.c b/log.c
index c69482de..9e34ffdf 100644
--- a/log.c
+++ b/log.c
@@ -300,15 +300,18 @@ void rwrite(enum logcode code, const char *buf, int len)
? buf[--len] : 0;
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#ifndef ICONV_CONST
+#define ICONV_CONST
+#endif
if (ic_chck != (iconv_t)-1) {
char convbuf[1024];
- const char *in_buf = buf;
+ ICONV_CONST char *in_buf = (ICONV_CONST char *)buf;
char *out_buf = convbuf;
size_t in_cnt = len, out_cnt = sizeof convbuf - 1;
iconv(ic_chck, NULL, 0, NULL, 0);
while (iconv(ic_chck, &in_buf,&in_cnt,
- &out_buf,&out_cnt) == (size_t)-1) {
+ &out_buf,&out_cnt) == (size_t)-1) {
if (out_buf != convbuf) {
filtered_fwrite(f, convbuf, out_buf - convbuf, 0);
out_buf = convbuf;