rework includes a bit

[apps/madmutt.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index a75b99a..6e1726a 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -18,9 +18,6 @@
 #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>
@@ -48,16 +45,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
@@ -495,7 +483,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))