X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=3e4e9f87ffd511e000d29f58bcce6e19e630a59f;hp=aaca563eb9814f1147fe78981385f3dc1ac8d8f0;hb=81f3d7a9a3b44af0b9019da5d6673c0dbc218626;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/globals.h b/globals.h
index aaca563..3e4e9f8 100644
--- a/globals.h
+++ b/globals.h
@@ -11,8 +11,6 @@
 
 #include <lib-lib/lib-lib.h>
 
-#include "lib/list.h"
-
 WHERE void (*mutt_error) (const char *, ...);
 WHERE void (*mutt_message) (const char *, ...);
 
@@ -21,7 +19,7 @@ WHERE CONTEXT *Context;
 WHERE char Errorbuf[STRING];
 WHERE char AttachmentMarker[STRING];
 
-WHERE char Quotebuf[SHORT_STRING];
+WHERE char Quotebuf[STRING];
 
 WHERE char *MuttDotlock;
 
@@ -86,10 +84,8 @@ WHERE char *Preconnect INITVAL (NULL);
 WHERE char *Tunnel INITVAL (NULL);
 WHERE short NetInc;
 
-#ifdef MIXMASTER
 WHERE char *Mixmaster;
 WHERE char *MixEntryFormat;
-#endif
 
 WHERE char *OperatingSystem INITVAL (NULL);
 
@@ -179,14 +175,14 @@ WHERE string_list_t *Ignore INITVAL (0);
 WHERE string_list_t *MimeLookupList INITVAL (0);
 WHERE string_list_t *UnIgnore INITVAL (0);
 
-WHERE list2_t *Alternates INITVAL (0);
-WHERE list2_t *UnAlternates INITVAL (0);
-WHERE list2_t *MailLists INITVAL (0);
-WHERE list2_t *UnMailLists INITVAL (0);
-WHERE list2_t *SubscribedLists INITVAL (0);
-WHERE list2_t *UnSubscribedLists INITVAL (0);
-WHERE SPAM_LIST *SpamList INITVAL (0);
-WHERE list2_t *NoSpamList INITVAL (0);
+WHERE rx_t *Alternates INITVAL (0);
+WHERE rx_t *UnAlternates INITVAL (0);
+WHERE rx_t *MailLists INITVAL (0);
+WHERE rx_t *UnMailLists INITVAL (0);
+WHERE rx_t *SubscribedLists INITVAL (0);
+WHERE rx_t *UnSubscribedLists INITVAL (0);
+WHERE rx_t *SpamList INITVAL (0);
+WHERE rx_t *NoSpamList INITVAL (0);
 
 /* bit vector for boolean variables */
 #ifdef MAIN_C
@@ -202,8 +198,6 @@ unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
 extern unsigned char QuadOptions[];
 #endif
 
-WHERE unsigned short Counter INITVAL (0);
-
 #ifdef USE_NNTP
 WHERE short NewsPollTimeout;
 WHERE short NntpContext;