X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=status.c;h=95ad3ffc9ee3e4932a623610cb9479ff80062ca5;hp=cc3d0d381e725f6754d5929c41427ce166e29708;hb=d4483b5add8d25008c305b51729f4a53bccfaab8;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/status.c b/status.c
index cc3d0d3..95ad3ff 100644
--- a/status.c
+++ b/status.c
@@ -12,6 +12,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_menu.h"
@@ -21,8 +23,6 @@
 #include "mx.h"
 #include "buffy.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <string.h>
 #include <ctype.h>
@@ -245,7 +245,7 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
 
       if (!StChars)
         buf[0] = 0;
-      else if (i >= str_len (StChars))
+      else if (i >= m_strlen(StChars))
         buf[0] = StChars[0];
       else
         buf[0] = StChars[i];