Mercurial > dovecot > original-hg > dovecot-1.2
changeset 611:9373933b1be1 HEAD
Removed warnings with Solaris' iconv()
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Fri, 15 Nov 2002 08:40:07 +0200 |
| parents | bc766660efc4 |
| children | 7c91f579ebed |
| files | src/lib-charset/charset-iconv.c |
| diffstat | 1 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-charset/charset-iconv.c Thu Nov 14 14:53:03 2002 +0200 +++ b/src/lib-charset/charset-iconv.c Fri Nov 15 08:40:07 2002 +0200 @@ -8,6 +8,12 @@ #include <iconv.h> #include <ctype.h> +#ifdef __sun__ +# define ICONV_CONST const +#else +# define ICONV_CONST +#endif + struct _CharsetTranslation { iconv_t cd; int ascii; @@ -64,7 +70,8 @@ const unsigned char **inbuf, size_t *insize, unsigned char *outbuf, size_t *outsize) { - char *ic_inbuf, *ic_outbuf; + ICONV_CONST char *ic_inbuf; + char *ic_outbuf; size_t outleft, max_size, i; if (t->cd == NULL) { @@ -77,7 +84,7 @@ return TRUE; } - ic_inbuf = (char *) *inbuf; + ic_inbuf = (ICONV_CONST char *) *inbuf; ic_outbuf = (char *) outbuf; outleft = *outsize; @@ -104,7 +111,8 @@ const unsigned char *buf, size_t *size) { iconv_t cd; - char *inbuf, *outbuf, *outpos; + ICONV_CONST char *inbuf; + char *outbuf, *outpos; size_t inleft, outleft, outsize, pos; if (charset == NULL || strcasecmp(charset, "us-ascii") == 0 || @@ -121,7 +129,7 @@ if (unknown_charset != NULL) *unknown_charset = FALSE; - inbuf = (char *) buf; + inbuf = (ICONV_CONST char *) buf; inleft = *size; outsize = outleft = *size * 2;