well this makes things fail for people ...

[apps/madmutt.git] / charset.h

diff --git a/charset.h b/charset.h
index 2f03c24..3b7566d 100644 (file)
--- a/charset.h
+++ b/charset.h
@@ -32,19 +32,19 @@
 #  include "config.h"
 #endif
 
+#include <lib-lua/lib-lua.h>
+#include "charset.li"
+
 /****************************************************************************/
 /* charset functions                                                        */
 /****************************************************************************/
 
-extern char *Charset;
 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 *);
 
 
@@ -54,21 +54,13 @@ const char *charset_getfirst(const char *);
 
 #define MUTT_ICONV_ERROR  ((iconv_t)(-1))
 
-#ifdef HAVE_ICONV_H
-#  include <iconv.h>
+#include <iconv.h>
 
 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