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

diff --git a/charset.h b/charset.h
index e238f48..4640b80 100644
--- a/charset.h
+++ b/charset.h
@@ -10,34 +10,46 @@
 #ifndef _CHARSET_H
 #define _CHARSET_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #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
 
 #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 ssize_t my_iconv(iconv_t ict, const char **inbuf, ssize_t *ilen,
+                               char **outbuf, ssize_t *olen)
+{
+    return iconv(ict, (char **)inbuf, (size_t*)ilen, outbuf, (size_t*)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 *);
+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);
@@ -45,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 */