X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=globals.h;h=089fae11285b20cc52b32d313996fee0885f8673;hb=9f817787be195b0065d0ffb9d8f2d0ef3595538b;hp=310479bf8b873dcee1ee8f66a6b7ae7b54cc4a26;hpb=80566f6aedda1e4bdcca38f9cb27101b5ba1029f;p=apps%2Fmadmutt.git

diff --git a/globals.h b/globals.h
index 310479b..089fae1 100644
--- a/globals.h
+++ b/globals.h
@@ -49,7 +49,6 @@ WHERE char *ImapUser INITVAL (NULL);
 WHERE char *Inbox;
 WHERE char *Ispell;
 WHERE char *Locale;
-WHERE char *MailcapPath;
 WHERE char *Maildir;
 
 #ifdef USE_HCACHE
@@ -77,9 +76,6 @@ WHERE short NetInc;
 
 WHERE char *Mixmaster;
 WHERE char *MixEntryFormat;
-
-WHERE char *OperatingSystem INITVAL (NULL);
-
 WHERE char *Muttrc INITVAL (NULL);
 
 #ifdef USE_NNTP
@@ -149,30 +145,19 @@ WHERE char *XtermIcon;
 WHERE char *CurrentFolder;
 WHERE char *LastFolder;
 
-WHERE string_list_t *AutoViewList INITVAL (0);
-WHERE string_list_t *AlternativeOrderList INITVAL (0);
 WHERE string_list_t *AttachAllow INITVAL(0);
 WHERE string_list_t *AttachExclude INITVAL(0);
 WHERE string_list_t *InlineAllow INITVAL(0);
 WHERE string_list_t *InlineExclude INITVAL(0);
 WHERE string_list_t *HeaderOrderList INITVAL (0);
 WHERE string_list_t *Ignore INITVAL (0);
-WHERE string_list_t *MimeLookupList INITVAL (0);
 WHERE string_list_t *UnIgnore INITVAL (0);
 
 /* bit vector for boolean variables */
-#ifdef MAIN_C
-unsigned char Options[(OPTMAX + 7) / 8];
-#else
-extern unsigned char Options[];
-#endif
+WHERE unsigned char Options[(OPTMAX + 7) / 8];
 
 /* bit vector for the yes/no/ask variable type */
-#ifdef MAIN_C
-unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
-#else
-extern unsigned char QuadOptions[];
-#endif
+WHERE unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
 
 #ifdef USE_NNTP
 WHERE short NewsPollTimeout;