move intl.h into lib-lib/macros.h

[apps/madmutt.git] / imap / message.c

diff --git a/imap/message.c b/imap/message.c
index dcfe4ca..660f954 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -32,8 +32,7 @@
 #include "pgp.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/str.h"
 #include "lib/debug.h"
 
@@ -133,7 +132,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
 
       rewind (fp);
       memset (&h, 0, sizeof (h));
-      h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+      h.data = p_new(IMAP_HEADER_DATA, 1);
       do {
         mfhrc = 0;
 
@@ -224,7 +223,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
     /* freshen fp, h */
     rewind (fp);
     memset (&h, 0, sizeof (h));
-    h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+    h.data = p_new(IMAP_HEADER_DATA, 1);
 
     /* this DO loop does two things:
      * 1. handles untagged messages, so we can try again on the same msg
@@ -796,7 +795,7 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s)
   unsigned char readonly;
 
   memset (&newh, 0, sizeof (newh));
-  newh.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+  newh.data = p_new(IMAP_HEADER_DATA, 1);
 
   debug_print (2, ("parsing FLAGS\n"));
   if ((s = msg_parse_flags (&newh, s)) == NULL) {