# include "config.h"
#endif
+#include <lib-lib/macros.h>
+#include <lib-lib/str.h>
+
#include "mutt.h"
#include "sort.h"
#include "thread.h"
#include "mutt_idna.h"
-#include "lib/str.h"
-#include "lib/intl.h"
#include <stdlib.h>
#include <string.h>
/* 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);
}