Patch from Julien danjou: fix a couple of compilation warnings.

[apps/madmutt.git] / charset.h

diff --git a/charset.h b/charset.h
index 9cbd2bd..5b3b732 100644 (file)
--- a/charset.h
+++ b/charset.h
@@ -10,6 +10,12 @@
 #ifndef _CHARSET_H
 #define _CHARSET_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "mutt.h"
+
 #ifdef HAVE_ICONV_H
 #include <iconv.h>
 #endif
@@ -23,8 +29,8 @@ 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, size_t *ilen,
+                               char **outbuf, size_t *olen)
 {
     return iconv(ict, (char **)inbuf, ilen, outbuf, olen);
 }