X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=1b5f0251474d4497369ff85b8c5f82dfc91ed280;hp=9cbd2bd4eea2e898c5b82613df06449e897dd37f;hb=c5ca8b7eaa727392811813926cda758bceef80f1;hpb=5e53f9e5f65aa5b3af6f5af9d868403536534afb diff --git a/charset.h b/charset.h index 9cbd2bd..1b5f025 100644 --- a/charset.h +++ b/charset.h @@ -10,6 +10,12 @@ #ifndef _CHARSET_H #define _CHARSET_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "mutt.h" + #ifdef HAVE_ICONV_H #include #endif @@ -23,10 +29,10 @@ typedef void *iconv_t; # 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) +static inline ssize_t my_iconv(iconv_t ict, const char **inbuf, ssize_t *ilen, + char **outbuf, ssize_t *olen) { - return iconv(ict, (char **)inbuf, ilen, outbuf, olen); + return iconv(ict, (char **)inbuf, (size_t*)ilen, outbuf, (size_t*)olen); } #endif