more charset improvements.

[apps/madmutt.git] / charset.h

diff --git a/charset.h b/charset.h
index 4640b80..b27a5c6 100644 (file)
--- a/charset.h
+++ b/charset.h
@@ -11,30 +11,35 @@
 #define _CHARSET_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#  include "config.h"
 #endif
 
-#ifdef HAVE_ICONV_H
-#include <iconv.h>
-#endif
+
+#define M_ICONV_HOOK_FROM 1
+#define M_ICONV_HOOK_TO   2
 
 extern char *Charset;
 extern int Charset_is_utf8;
 
-#ifndef HAVE_ICONV_T_DEF
-typedef void *iconv_t;
-#endif
+void charset_initialize(void);
+void mutt_canonical_charset(char *, ssize_t, const char *);
+
+int charset_is_utf8(const char *s);
+int charset_is_us_ascii(const char *s);
+
+#ifdef HAVE_ICONV_H
+#  include <iconv.h>
 
-#ifndef HAVE_ICONV
+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)     ((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);
@@ -52,12 +57,6 @@ int fgetconv (FGETCONV *);
 char *fgetconvs (char *, ssize_t, FGETCONV *);
 void fgetconv_close (FGETCONV **);
 
-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 */