X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=from.c;h=1ac13f5d7c7ef77e39648c8ac4daa5c3adb94e4b;hp=e3c85eb4dab503e88bfd8a8107159f277a624c52;hb=9274cbe8e6410ddb95ddc667faa678a29da85420;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/from.c b/from.c
index e3c85eb..1ac13f5 100644
--- a/from.c
+++ b/from.c
@@ -12,12 +12,11 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <ctype.h>
@@ -45,7 +44,7 @@ static int is_day_name (const char *s)
 {
   int i;
 
-  if ((str_len (s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
+  if ((m_strlen(s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
     return 0;
   for (i = 0; i < 7; i++)
     if (str_ncasecmp (s, Weekdays[i], 3) == 0)