license statements.

[apps/madmutt.git] / thread.c

diff --git a/thread.c b/thread.c
index f64dc3f..ac0d67a 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -12,13 +12,12 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "sort.h"
 #include "thread.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 
 #include <string.h>
 #include <ctype.h>
@@ -581,7 +580,7 @@ THREAD *mutt_sort_subthreads (THREAD * thread, int init)
         /* put them into the array */
         for (i = 0; thread; i++, thread = thread->prev) {
           if (i >= array_size)
-            mem_realloc (&array, (array_size *= 2) * sizeof (THREAD *));
+            p_realloc(&array, array_size *= 2);
 
           array[i] = thread;
         }
@@ -1285,7 +1284,7 @@ static int link_threads (HEADER * parent, HEADER * child, CONTEXT * ctx)
   mutt_break_thread (child);
 
   child->env->in_reply_to = mutt_new_list ();
-  child->env->in_reply_to->data = str_dup (parent->env->message_id);
+  child->env->in_reply_to->data = m_strdup(parent->env->message_id);
 
   mutt_set_flag (ctx, child, M_TAG, 0);