From 53acc07eb1d28a592967d0f6ffeeb3d5ba2cf47d Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sat, 6 Jan 2007 23:57:59 +0000 Subject: [PATCH] Fixed compilation problem with iconv under FreeBSD --- ChangeLog | 3 ++- src/common/util.c | 4 ++-- weechat/ChangeLog | 3 ++- weechat/src/common/util.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b5e5a071..a50e90608 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-01-06 +ChangeLog - 2007-01-07 Version 0.2.3 (under dev!): + * fixed compilation problem with iconv under FreeBSD * fixed bugs with charset: now decodes/encodes nicks and channels in IRC messages (bug #18716) diff --git a/src/common/util.c b/src/common/util.c index 9990d880f..4c31dafdc 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -202,7 +202,7 @@ weechat_iconv (char *from_code, char *to_code, char *string) iconv_t cd; char *inbuf; int done; - ICONV_CONST char *ptr_inbuf; + char *ptr_inbuf; char *ptr_outbuf; size_t err, inbytesleft, outbytesleft; @@ -223,7 +223,7 @@ weechat_iconv (char *from_code, char *to_code, char *string) done = 0; while (!done) { - err = iconv (cd, &ptr_inbuf, &inbytesleft, + err = iconv (cd, (ICONV_CONST char **)(&ptr_inbuf), &inbytesleft, &ptr_outbuf, &outbytesleft); if (err == (size_t)(-1)) { diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 1b5e5a071..a50e90608 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-01-06 +ChangeLog - 2007-01-07 Version 0.2.3 (under dev!): + * fixed compilation problem with iconv under FreeBSD * fixed bugs with charset: now decodes/encodes nicks and channels in IRC messages (bug #18716) diff --git a/weechat/src/common/util.c b/weechat/src/common/util.c index 9990d880f..4c31dafdc 100644 --- a/weechat/src/common/util.c +++ b/weechat/src/common/util.c @@ -202,7 +202,7 @@ weechat_iconv (char *from_code, char *to_code, char *string) iconv_t cd; char *inbuf; int done; - ICONV_CONST char *ptr_inbuf; + char *ptr_inbuf; char *ptr_outbuf; size_t err, inbytesleft, outbytesleft; @@ -223,7 +223,7 @@ weechat_iconv (char *from_code, char *to_code, char *string) done = 0; while (!done) { - err = iconv (cd, &ptr_inbuf, &inbytesleft, + err = iconv (cd, (ICONV_CONST char **)(&ptr_inbuf), &inbytesleft, &ptr_outbuf, &outbytesleft); if (err == (size_t)(-1)) {