xterm.c was absurd, no need to put trivial functions like this in a

[apps/madmutt.git] / mbyte.c

diff --git a/mbyte.c b/mbyte.c
index 6993422..ce26508 100644 (file)
--- a/mbyte.c
+++ b/mbyte.c
@@ -15,11 +15,12 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mbyte.h"
 #include "charset.h"
 
-#include "lib/intl.h"
 
 #include <errno.h>
 
@@ -102,14 +103,14 @@ static size_t wcrtomb_iconv (char *s, wchar_t wc, iconv_t cd)
     ib = buf;
     ob = s;
     obl = MB_LEN_MAX;
-    r = iconv (cd, &ib, &ibl, &ob, &obl);
+    r = my_iconv(cd, &ib, &ibl, &ob, &obl);
   }
   else {
     ib = "";
     ibl = 1;
     ob = buf;
     obl = sizeof (buf);
-    r = iconv (cd, &ib, &ibl, &ob, &obl);
+    r = my_iconv(cd, &ib, &ibl, &ob, &obl);
   }
   return ob - s;
 }
@@ -168,7 +169,7 @@ size_t mbrtowc_iconv (wchar_t * pwc, const char *s, size_t n,
   ibl = 1;
 
   for (;;) {
-    r = iconv (cd, &ib, &ibl, &ob, &obl);
+    r = my_iconv(cd, &ib, &ibl, &ob, &obl);
     if (ob > bufo && (!k || ib > bufi + k)) {
       /* we have a character */
       memset (ps, 0, sizeof (*ps));