always build POP support, we do a /mail/ client, right ?

[apps/madmutt.git] / hcache.c

diff --git a/hcache.c b/hcache.c
index 877afd0..308ac68 100644 (file)
--- 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);
@@ -456,15 +457,11 @@ static int generate_crc32 ()
 
 #if HAVE_LANGINFO_CODESET
   crc = crc32 (crc, (unsigned char const *) Charset, m_strlen(Charset));
-  crc =
-    crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
-           m_strlen("HAVE_LANGINFO_CODESET"));
+  crc = crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
+               m_strlen("HAVE_LANGINFO_CODESET"));
 #endif
 
-#ifdef USE_POP
-  crc =
-    crc32 (crc, (unsigned char const *) "USE_POP", m_strlen("USE_POP"));
-#endif
+  crc = crc32(crc, (unsigned char const *) "USE_POP", m_strlen("USE_POP"));
 
 #ifdef MIXMASTER
   crc =