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

diff --git a/status.c b/status.c
index aa94a86..95ad3ff 100644
--- a/status.c
+++ b/status.c
@@ -11,6 +11,10 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
@@ -19,9 +23,6 @@
 #include "mx.h"
 #include "buffy.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <string.h>
 #include <ctype.h>
@@ -244,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];