X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=mutt.h;h=27b1239353d8a158c2190809299998b9f87c3d0e;hb=3a63661c35d4b5f93501efab7e5478386ad02565;hp=e0b9fb37b41bfc07b749aca41bdf52de7955ed2f;hpb=d0dc8fb657cff90709c15d4b106415b868857f6a;p=apps%2Fmadmutt.git

diff --git a/mutt.h b/mutt.h
index e0b9fb3..27b1239 100644
--- a/mutt.h
+++ b/mutt.h
@@ -101,11 +101,9 @@ typedef enum {
 #define M_REPLYHOOK	(1<<10)
 #define M_SEND2HOOK     (1<<11)
 
-#ifdef USE_COMPRESSED
 #define M_OPENHOOK	(1<<12)
 #define M_APPENDHOOK	(1<<13)
 #define M_CLOSEHOOK	(1<<14)
-#endif
 
 /* tree characters for linearize_tree and print_enriched_string */
 #define M_TREE_LLCORNER		1
@@ -229,18 +227,14 @@ enum {
   OPT_DELETE,
   OPT_FORWEDIT,
   OPT_INCLUDE,
-#ifdef USE_IMAP
   OPT_IMAPRECONNECT,
-#endif
   OPT_MFUPTO,
   OPT_MIMEFWD,
   OPT_MIMEFWDREST,
   OPT_MOVE,
   OPT_PGPMIMEAUTO,              /* ask to revert to PGP/MIME when inline fails */
-#ifdef USE_POP
   OPT_POPDELETE,
   OPT_POPRECONNECT,
-#endif
   OPT_POSTPONE,
   OPT_PRINT,
   OPT_QUIT,
@@ -270,10 +264,9 @@ enum {
 #define SENDFORWARD	(1<<3)
 #define SENDPOSTPONED	(1<<4)
 #define SENDBATCH	(1<<5)
-#define SENDMAILX	(1<<6)
-#define SENDKEY		(1<<7)
-#define SENDRESEND	(1<<8)
-#define SENDNEWS	(1<<9)
+#define SENDKEY		(1<<6)
+#define SENDRESEND	(1<<7)
+#define SENDNEWS	(1<<8)
 
 /* flags to _mutt_select_file() */
 #define M_SEL_BUFFY	(1<<0)
@@ -337,13 +330,11 @@ enum {
   OPTHIDETOPLIMITED,
   OPTHIDETOPMISSING,
   OPTIGNORELISTREPLYTO,
-#ifdef USE_IMAP
   OPTIMAPCHECKSUBSCRIBED,
   OPTIMAPLSUB,
   OPTIMAPPASSIVE,
   OPTIMAPPEEK,
   OPTIMAPSERVERNOISE,
-#endif
 #if defined(USE_SSL) || defined(USE_GNUTLS)
 # ifndef USE_GNUTLS
   OPTSSLSYSTEMCERTS,
@@ -374,10 +365,8 @@ enum {
   OPTPAGERSTOP,
   OPTPIPEDECODE,
   OPTPIPESPLIT,
-#ifdef USE_POP
   OPTPOPAUTHTRYALL,
   OPTPOPLAST,
-#endif
   OPTPRINTDECODE,
   OPTPRINTSPLIT,
   OPTPROMPTAFTER,
@@ -697,13 +686,8 @@ typedef struct header {
   LIST *chain;
 #endif
 
-#ifdef USE_POP
   int refno;                    /* message number on server */
-#endif
-
-#if defined USE_POP || defined USE_IMAP || defined USE_NNTP
   void *data;                   /* driver-specific data */
-#endif
 
   char *maildir_flags;          /* unknown maildir flags */
 } HEADER;
@@ -772,16 +756,12 @@ typedef struct {
   int appended;                 /* how many saved messages? */
   int flagged;                  /* how many flagged messages */
   int msgnotreadyet;            /* which msg "new" in pager, -1 if none */
-#if defined USE_POP || defined USE_IMAP || defined USE_NNTP
   void *data;                   /* driver specific data */
-#endif                          /* USE_IMAP */
 
   short magic;                  /* mailbox type */
 
-#ifdef USE_COMPRESSED
   void *compressinfo;           /* compressed mbox module private data */
   char *realpath;               /* path to compressed mailbox */
-#endif                          /* USE_COMPRESSED */
 
   unsigned int locked:1;        /* is the mailbox locked? */
   unsigned int changed:1;       /* mailbox has been modified */