More changes to the utf-8 friendly line editor: Implement some

missing functions, include some more header files.

1 files changed, 16 insertions, 6 deletions

diff --git a/mbyte.h b/mbyte.h
index 475582e9..4fba8a77 100644
--- a/mbyte.h
+++ b/mbyte.h
@@ -1,18 +1,28 @@
 #ifndef _MBYTE_H
-#define _MBYTE_H
+# define _MBYTE_H
 
-void mutt_set_charset (char *charset);
-extern int Charset_is_utf8;
+# include "config.h"
 
-size_t utf8rtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *_ps);
+# ifdef HAVE_WC_FUNCS
+#  ifdef HAVE_WCHAR_H
+#   include <wchar.h>
+#  endif
+#  ifdef HAVE_WCTYPE_H
+#   include <wctype.h>
+#  endif
+# endif
 
-#ifndef HAVE_WC_FUNCS
+# ifndef HAVE_WC_FUNCS
 size_t wcrtomb (char *s, wchar_t wc, mbstate_t *ps);
 size_t mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps);
 int iswprint (wint_t wc);
 int wcwidth (wchar_t wc);
-#endif /* !HAVE_WC_FUNCS */
+# endif /* !HAVE_WC_FUNCS */
+
 
+void mutt_set_charset (char *charset);
+extern int Charset_is_utf8;
+size_t utf8rtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *_ps);
 wchar_t replacement_char (void);
 
 #endif /* _MBYTE_H */