#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>
#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
OPTFORWQUOTE,
#ifdef USE_HCACHE
OPTHCACHEVERIFY,
-#if HAVE_QDBM
+#ifdef HAVE_QDBM
OPTHCACHECOMPRESS,
#endif /* HAVE_QDBM */
#endif
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))
#define M_PARTS_RECOUNT (1<<1) /* force recount */
#include "protos.h"
-#include "lib.h"
#include "globals.h"
#endif /* !_MUTT_H */