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

diff --git a/hcache.c b/hcache.c
index e6a1b6d..308ac68 100644
--- a/hcache.c
+++ b/hcache.c
@@ -172,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;
@@ -192,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);
@@ -457,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 =