X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=52fe118aab2d64960c3904152e96fa9ff5e84289;hp=9b00f9edf3b6e50c5df68c9d87adc9dff1516586;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/commands.c b/commands.c
index 9b00f9e..52fe118 100644
--- a/commands.c
+++ b/commands.c
@@ -14,6 +14,8 @@
 
 #include <lib-lib/mem.h>
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
@@ -40,9 +42,6 @@
 #include "buffy.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <errno.h>
@@ -860,7 +859,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     size_t l;
 
     for (p = b->parameter; p; p = p->next) {
-      l = str_len (buf);
+      l = m_strlen(buf);
 
       rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
       snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);