X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=0e2b2855b4ed72e2bafe6bd2a440c13f19f0fce4;hp=b1270eaaf3d12b8c5cbc817e5063d4b7a477bdf8;hb=56025510c87ad388a257fcbd8b369b0edcf97c34;hpb=97677c08933e16e25ecb3c12473ef1efdab7962b

diff --git a/mutt.h b/mutt.h
index b1270ea..0e2b285 100644
--- a/mutt.h
+++ b/mutt.h
@@ -11,36 +11,18 @@
 #ifndef _MUTT_H
 #define _MUTT_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>            /* needed for SEEK_SET */
-#endif
-#ifdef HAVE_UNIX_H
-# include <unix.h>              /* needed for snprintf on QNX. */
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <signal.h>
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-#if defined(HAVE_WCTYPE_H) && defined(HAVE_WC_FUNCS)
-# include <wctype.h>
-#endif
 
 #ifndef _POSIX_PATH_MAX
 #include <posix1_lim.h>
 #endif
 
-#include <pwd.h>
-#include <grp.h>
-
 #include <lib-lib/buffer.h>
 #include <lib-lib/hash.h>
 #include <lib-lib/list.h>
@@ -48,16 +30,7 @@
 
 #include <lib-mime/mime.h>
 
-#include "charset.h"
-
-#ifndef HAVE_WC_FUNCS
-# ifdef MB_LEN_MAX
-#  undef MB_LEN_MAX
-# endif
-# define MB_LEN_MAX 16
-#endif
-
-# define MUTT_VERSION (VERSION)
+#define MUTT_VERSION (VERSION)
 
 /* nifty trick I stole from ELM 2.5alpha. */
 #ifdef MAIN_C
@@ -313,7 +286,7 @@ enum {
   OPTFORWQUOTE,
 #ifdef USE_HCACHE
   OPTHCACHEVERIFY,
-#if HAVE_QDBM
+#ifdef HAVE_QDBM
   OPTHCACHECOMPRESS,
 #endif /* HAVE_QDBM */
 #endif
@@ -495,7 +468,7 @@ enum {
   OPTMAX
 };
 
-#define mutt_bit_alloc(n) calloc ((n + 7) / 8, sizeof (char))
+#define mutt_bit_alloc(n) p_new(char, (n + 7) / 8)
 #define mutt_bit_set(v,n) v[n/8] |= (1 << (n % 8))
 #define mutt_bit_unset(v,n) v[n/8] &= ~(1 << (n % 8))
 #define mutt_bit_toggle(v,n) v[n/8] ^= (1 << (n % 8))
@@ -517,9 +490,9 @@ typedef struct spam_list_t {
 #define mutt_new_spam_list() p_new(SPAM_LIST, 1)
 void mutt_free_spam_list (SPAM_LIST **);
 
-int mutt_matches_ignore (const char *, LIST *);
+int mutt_matches_ignore (const char *, string_list_t *);
 
-void mutt_init (int, LIST *);
+void mutt_init (int, string_list_t *);
 
 typedef struct thread {
   unsigned int fake_thread:1;
@@ -616,7 +589,6 @@ typedef struct {
 #define M_PARTS_RECOUNT (1<<1) /* force recount */
 
 #include "protos.h"
-#include "lib.h"
 #include "globals.h"
 
 #endif /* !_MUTT_H */