merge crypt back into $top_builddir :)

[apps/madmutt.git] / lib-mx / hcache.c

diff --git a/lib-mx/hcache.c b/lib-mx/hcache.c
index 953e70f..bdbeeb9 100644 (file)
--- a/lib-mx/hcache.c
+++ b/lib-mx/hcache.c
@@ -28,11 +28,11 @@
 #include <lib-hash/hash.h>
 #include <lib-mime/mime.h>
 
+#include <imap/message.h>
+
 #include "charset.h"
 #include "mutt.h"
-#include <imap/message.h>
-#include "mx.h"
-#include "lib.h"
+#include "hcache.h"
 
 struct header_cache {
 #if defined(HAVE_QDBM)
@@ -361,17 +361,15 @@ static int generate_crc32 ()
                (MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
 
 #ifdef HAVE_LANGINFO_CODESET
-  crc = crc32(crc, (unsigned char const *) Charset, m_strlen(Charset));
+  crc = crc32(crc, (unsigned char const *) MCharset.charset, m_strlen(MCharset.charset));
   crc = crc32(crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
               m_strlen("HAVE_LANGINFO_CODESET"));
 #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"));
-#endif
 
   crc = crc32(crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP"));