X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt.c;h=923b8d759b63b84a020b269002fde0caa9a81f19;hp=e5019eca6517b99cab4199d7280d1c0ef45b784d;hb=ee869a42bc5677da8e3602ec1947af1736786648;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/crypt.c b/crypt.c
index e5019ec..923b8d7 100644
--- a/crypt.c
+++ b/crypt.c
@@ -16,10 +16,13 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
+#include <lib-lib/ascii.h>
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "handler.h"
 #include "mutt_curses.h"
 #include "mime.h"
@@ -27,8 +30,6 @@
 #include "mutt_crypt.h"
 #include "pgp.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <sys/wait.h>
 #include <string.h>
@@ -389,7 +390,7 @@ int mutt_is_application_smime (BODY * m)
 
     /* no .p7c, .p10 support yet. */
 
-    len = str_len (t) - 4;
+    len = m_strlen(t) - 4;
     if (len > 0 && *(t + len) == '.') {
       len++;
       if (!ascii_strcasecmp ((t + len), "p7m"))