X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=status.c;h=2a925b699b9a86e4fc5320c7931182531bbd0613;hb=b21e95b6f27174909ff28e8e95c13bec01e87f28;hp=429a718c6d07791a342f9ae75a0ae47c84e27ae4;hpb=19457d3e9b0b827930530f5e8f4f04dd745d685f;p=apps%2Fmadmutt.git

diff --git a/status.c b/status.c
index 429a718..2a925b6 100644
--- a/status.c
+++ b/status.c
@@ -11,6 +11,9 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
@@ -19,8 +22,6 @@
 #include "mx.h"
 #include "buffy.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <string.h>
@@ -62,7 +63,8 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
                                       const char *elsestring,
                                       unsigned long data, format_flag flags)
 {
-  char fmt[SHORT_STRING], tmp[SHORT_STRING], *cp, *p;
+  char fmt[SHORT_STRING], tmp[SHORT_STRING];
+  const char *cp, *p;
   int count, optional = (flags & M_FORMAT_OPTIONAL);
   MUTTMENU *menu = (MUTTMENU *) data;