X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=d2292e3984882e6975d15a13c5ecb7356bd6db65;hp=47bed4cd89e3e2d3176b85b2a0c1b5e6e673266f;hb=dd531b757dd6a43494d5cde51b2f0f24c6606a0e;hpb=5a4df9d0e93209aeade80f632158036799f3e9bc

diff --git a/globals.h b/globals.h
index 47bed4c..d2292e3 100644
--- a/globals.h
+++ b/globals.h
@@ -84,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);
 
@@ -183,7 +181,7 @@ 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 SPAM_LIST *SpamList INITVAL (0);
+WHERE rx_t *SpamList INITVAL (0);
 WHERE rx_t *NoSpamList INITVAL (0);
 
 /* bit vector for boolean variables */
@@ -200,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;