X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=4640b80b18da1c8a42e5d6faa724d75958499638;hp=f8fcc9858c8cee71784b44ae58f69c6ca3537c33;hb=ebc89176d4b5d2b1363114bd716c7f7fcb2464aa;hpb=86cf852af75aa1f893b25a5fd615ac1fdb1b6033

diff --git a/charset.h b/charset.h
index f8fcc98..4640b80 100644
--- a/charset.h
+++ b/charset.h
@@ -14,12 +14,13 @@
 #include "config.h"
 #endif
 
-#include "mutt.h"
-
 #ifdef HAVE_ICONV_H
 #include <iconv.h>
 #endif
 
+extern char *Charset;
+extern int Charset_is_utf8;
+
 #ifndef HAVE_ICONV_T_DEF
 typedef void *iconv_t;
 #endif
@@ -29,10 +30,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
 
@@ -41,14 +42,14 @@ 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, const char **, size_t *, char **, size_t *,
-                   const char **, const char *);
+ssize_t mutt_iconv (iconv_t, const char **, ssize_t *, char **, ssize_t *,
+                    const char **, const char *);
 
 typedef void *FGETCONV;
 
 FGETCONV *fgetconv_open (FILE *, const char *, const char *, int);
 int fgetconv (FGETCONV *);
-char *fgetconvs (char *, size_t, FGETCONV *);
+char *fgetconvs (char *, ssize_t, FGETCONV *);
 void fgetconv_close (FGETCONV **);
 
 void mutt_set_langinfo_charset (void);
@@ -56,4 +57,7 @@ void mutt_set_langinfo_charset (void);
 #define M_ICONV_HOOK_FROM 1
 #define M_ICONV_HOOK_TO   2
 
+void mutt_set_charset(char *charset);
+wchar_t replacement_char(void);
+
 #endif /* _CHARSET_H */