X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.c;h=2c1eb5c22e82c5965594b37c148e99b665fce456;hp=0e0f9464302c924e85144ebc6e80e1436cefcc33;hb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/account.c b/account.c
index 0e0f946..2c1eb5c 100644
--- a/account.c
+++ b/account.c
@@ -14,16 +14,15 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
-#include "ascii.h"
 #include "account.h"
 #include "url.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 /* mutt_account_match: compare account info (host/port/user/login) */
 int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
@@ -58,11 +57,11 @@ int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
 #endif
 
   if (a1->flags & a2->flags & M_ACCT_USER)
-    return (!str_cmp (a1->user, a2->user));
+    return (!m_strcmp(a1->user, a2->user));
   if (a1->flags & M_ACCT_USER)
-    return (!str_cmp (a1->user, user));
+    return (!m_strcmp(a1->user, user));
   if (a2->flags & M_ACCT_USER)
-    return (!str_cmp (a2->user, user));
+    return (!m_strcmp(a2->user, user));
 
   return 1;
 }