X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=140df180c6b746ebeed019b631cd272dfd6c532e;hp=877afd093e6755d035f7f1c0ab6bb314441c2b50;hb=85832555b8d510499b13bc454e458382d36e195d;hpb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7

diff --git a/hcache.c b/hcache.c
index 877afd0..140df18 100644
--- a/hcache.c
+++ b/hcache.c
@@ -43,11 +43,12 @@
 #include <lib-lib/mem.h>
 #include <lib-hash/hash.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #ifdef USE_IMAP
 #include "message.h"
 #endif
-#include "mime.h"
 #include "mx.h"
 #include "lib.h"
 
@@ -171,7 +172,7 @@ static void restore_char (char **c, const unsigned char *d, int *off)
   *off += size;
 }
 
-static unsigned char *dump_address (ADDRESS * a, unsigned char *d, int *off)
+static unsigned char *dump_address (address_t * a, unsigned char *d, int *off)
 {
   unsigned int counter = 0;
   unsigned int start_off = *off;
@@ -191,14 +192,14 @@ static unsigned char *dump_address (ADDRESS * a, unsigned char *d, int *off)
   return d;
 }
 
-static void restore_address (ADDRESS ** a, const unsigned char *d, int *off)
+static void restore_address (address_t ** a, const unsigned char *d, int *off)
 {
   unsigned int counter;
 
   restore_int (&counter, d, off);
 
   while (counter) {
-    *a = p_new(ADDRESS, 1);
+    *a = p_new(address_t, 1);
     restore_char (&(*a)->personal, d, off);
     restore_char (&(*a)->mailbox, d, off);
     restore_int ((unsigned int *) &(*a)->group, d, off);