X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=9cbd2bd4eea2e898c5b82613df06449e897dd37f;hp=e238f48b5c6e8a5723372eaee78f37951ab7aed9;hb=700dbab719f75421b81f8c603d239bbf38cfa6f9;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/charset.h b/charset.h index e238f48..9cbd2bd 100644 --- a/charset.h +++ b/charset.h @@ -19,19 +19,24 @@ typedef void *iconv_t; #endif #ifndef HAVE_ICONV -#define ICONV_CONST /**/ - iconv_t iconv_open (const char *, const char *); -size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *); -int iconv_close (iconv_t); +# define iconv_open(a, b) ((iconv_t)(-1)) +# define my_iconv(a,b,c,d,e) 0 +# define iconv_close(a) 0 +#else +static inline size_t my_iconv(iconv_t ict, const char **inbuf, size_t *ilen, + char **outbuf, size_t *olen) +{ + return iconv(ict, (char **)inbuf, ilen, outbuf, olen); +} #endif int mutt_convert_string (char **, const char *, const char *, int); -char *mutt_get_first_charset (const char *); +const char *mutt_get_first_charset (const char *); int mutt_convert_nonmime_string (char **); iconv_t mutt_iconv_open (const char *, const char *, int); -size_t mutt_iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *, - ICONV_CONST char **, const char *); +size_t mutt_iconv (iconv_t, const char **, size_t *, char **, size_t *, + const char **, const char *); typedef void *FGETCONV;