X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sort.c;h=b932ab12eda0c4eca2c596b7a0dd21524bebf49a;hp=93ba2e45d30a6f2364cf8f2bde000c6b58c6ae25;hb=2ea77d3b2827ba23feb756ce2fb936565ae38998;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/sort.c b/sort.c
index 93ba2e4..b932ab1 100644
--- a/sort.c
+++ b/sort.c
@@ -11,12 +11,14 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+#include <lib-lib/str.h>
+
 #include "mutt.h"
-#include "lib/str.h"
 #include "sort.h"
+#include "thread.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -213,13 +215,13 @@ int compare_spam (const void *a, const void *b)
   /* If either aptr or bptr is equal to data, there is no numeric    */
   /* value for that spam attribute. In this case, compare lexically. */
   if ((aptr == (*ppa)->env->spam->data) || (bptr == (*ppb)->env->spam->data))
-    return (SORTCODE (str_cmp (aptr, bptr)));
+    return (SORTCODE (m_strcmp(aptr, bptr)));
 
   /* Otherwise, we have numeric value for both attrs. If these values */
   /* are equal, then we first fall back upon string comparison, then  */
   /* upon auxiliary sort.                                             */
   if (result == 0) {
-    result = str_cmp (aptr, bptr);
+    result = m_strcmp(aptr, bptr);
     if (result == 0)
       AUXSORT (result, a, b);
   }