X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=681ec8619733346652f653aeb058a75a4889557e;hp=e6a1b6db9ab1bee5577f255591ee16a6b9cf19e3;hb=a5074c20c3873e4a1fbfea551b07bd1c867a9def;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3

diff --git a/hcache.c b/hcache.c
index e6a1b6d..681ec86 100644
--- a/hcache.c
+++ b/hcache.c
@@ -46,9 +46,7 @@
 #include <lib-mime/mime.h>
 
 #include "mutt.h"
-#ifdef USE_IMAP
-#include "message.h"
-#endif
+#include <imap/message.h>
 #include "mx.h"
 #include "lib.h"
 
@@ -172,7 +170,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;
@@ -192,14 +190,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,31 +454,22 @@ static int generate_crc32 ()
                (MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
 
 #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 *) Charset, m_strlen(Charset));
+  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 =
-    crc32 (crc, (unsigned char const *) "MIXMASTER",
-           m_strlen("MIXMASTER"));
+  crc = crc32(crc, (unsigned char const *) "MIXMASTER",
+              m_strlen("MIXMASTER"));
 #endif
 
-#ifdef USE_IMAP
-  crc =
-    crc32 (crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP"));
-#endif
+  crc = crc32(crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP"));
 
 #ifdef USE_NNTP
-  crc =
-    crc32 (crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP"));
+  crc = crc32(crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP"));
 #endif
   return crc;
 }