X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_ssl.c;h=804183cf0138cea306165d69609b8638ffbab598;hp=6a8303260fffd53d48a7860288030d54de90baa1;hb=3e611c4b53a33408955152e1c9336f8643ea096e;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 6a83032..804183c 100644
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -18,11 +18,11 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
-#undef _
-
 #include <string.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_socket.h"
@@ -30,9 +30,6 @@
 #include "mutt_curses.h"
 #include "mutt_ssl.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #if OPENSSL_VERSION_NUMBER >= 0x00904000L
@@ -419,7 +416,7 @@ static char *x509_get_part (char *line, const char *ndx)
 
   c = strstr (line, ndx);
   if (c) {
-    c += str_len (ndx);
+    c += m_strlen(ndx);
     c2 = strchr (c, '/');
     if (c2)
       *c2 = '\0';