X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=681ec8619733346652f653aeb058a75a4889557e;hp=140df180c6b746ebeed019b631cd272dfd6c532e;hb=97c8c97b6199b4b8a0cdf7923e64decbb47e7797;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/hcache.c b/hcache.c
index 140df18..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"
 
@@ -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;
 }