X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=3b7566dac151a84ed114a0106f6c7b1cef3929b5;hp=5b1aa658979ebf9493aed9d3e74486c6c8107d10;hb=db3bd72d8b48f1f9b49899da081ffbec4ce2c1c6;hpb=8f75834aeadb902879602a82a259f4d3bf9c569c diff --git a/charset.h b/charset.h index 5b1aa65..3b7566d 100644 --- a/charset.h +++ b/charset.h @@ -54,21 +54,13 @@ const char *charset_getfirst(const char *); #define MUTT_ICONV_ERROR ((iconv_t)(-1)) -#ifdef HAVE_ICONV_H -# include +#include static inline ssize_t my_iconv(iconv_t ict, const char **in, ssize_t *il, char **out, ssize_t *ol) { return iconv(ict, (char **)in, (size_t*)il, out, (size_t*)ol); } -#else -# define iconv_t void* -# define iconv_open(a, b) MUTT_ICONV_ERROR -# define my_iconv(a,b,c,d,e) 0 -# define iconv_close(a) 0 -#endif - #define M_ICONV_HOOK_FROM 1 #define M_ICONV_HOOK_TO 2