X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=646526bc94006f14ddfcb8fe6e00dc598945acf0;hp=67eb48270e2941a9bef2af589290c4b79439fc1d;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=16534e98723674fa391e3fc29d2a07ce419c13dd

diff --git a/charset.h b/charset.h
index 67eb482..646526b 100644
--- a/charset.h
+++ b/charset.h
@@ -42,11 +42,9 @@
 extern int Charset_is_utf8;
 extern wchar_t CharsetReplacement;
 
-void charset_initialize(void);
 void charset_canonicalize(char *, ssize_t, const char *);
-int charset_is_utf8(const char *s);
-int charset_is_us_ascii(const char *s);
-
+int  charset_is_utf8(const char *);
+int  charset_is_us_ascii(const char *);
 const char *charset_getfirst(const char *);
 
 
@@ -56,28 +54,17 @@ const char *charset_getfirst(const char *);
 
 #define MUTT_ICONV_ERROR  ((iconv_t)(-1))
 
-#ifdef HAVE_ICONV_H
-#  include <iconv.h>
+#include <iconv.h>
 
+iconv_t mutt_iconv_open(const char *, const char *, int);
 static inline ssize_t
-my_iconv(iconv_t ict, const char **in, ssize_t *il, char **out, ssize_t *ol) {
+mutt_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
 
-iconv_t mutt_iconv_open(const char *, const char *, int);
-ssize_t mutt_iconv(iconv_t, const char **, ssize_t *, char **, ssize_t *,
-                   const char **, const char *);
-
 int mutt_convert_string(char **, const char *, const char *, int);
 int mutt_convert_nonmime_string (char **);