X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=3a96cae005dc44599302140e40eb7e3ea032972b;hp=97f792c14899bff7b26330407a4a2e3a0454f907;hb=6920eb5798f2d9f25e5ea1af2ba86122cf408bd1;hpb=8fac066483c9ae3176984527c037190fca9dc7f0

diff --git a/globals.h b/globals.h
index 97f792c..3a96cae 100644
--- a/globals.h
+++ b/globals.h
@@ -39,7 +39,6 @@ WHERE char *HdrFmt;
 WHERE char *ImapAuthenticators INITVAL (NULL);
 WHERE char *ImapDelimChars INITVAL (NULL);
 WHERE char *ImapHeaders;
-WHERE char *ImapHomeNamespace INITVAL (NULL);
 WHERE char *ImapLogin INITVAL (NULL);
 WHERE char *ImapPass INITVAL (NULL);
 WHERE char *ImapUser INITVAL (NULL);
@@ -47,12 +46,6 @@ WHERE char *Inbox;
 WHERE char *Locale;
 WHERE char *Maildir;
 
-#ifdef USE_HCACHE
-WHERE char *HeaderCache;
-#if defined(HAVE_GDBM) || defined(HAVE_DB4)
-WHERE char *HeaderCachePageSize;
-#endif /* HAVE_GDBM || HAVE_DB4 */
-#endif /* USE_HCACHE */
 WHERE char *MhFlagged;
 WHERE char *MhReplied;
 WHERE char *MhUnseen;
@@ -69,20 +62,8 @@ WHERE rx_t StripWasRegexp;
 WHERE char *Preconnect INITVAL (NULL);
 WHERE char *Tunnel INITVAL (NULL);
 WHERE short NetInc;
-
-WHERE char *Mixmaster;
-WHERE char *MixEntryFormat;
 WHERE char *Muttrc INITVAL (NULL);
 
-#ifdef USE_NNTP
-WHERE char *NewsCacheDir;
-WHERE char *GroupFormat;
-WHERE char *Inews;
-WHERE char *NewsServer;
-WHERE char *NntpUser;
-WHERE char *NntpPass;
-WHERE char *NewsRc;
-#endif
 WHERE char *PagerFmt;
 WHERE char *PipeSep;
 
@@ -97,24 +78,13 @@ WHERE char *Prefix;
 WHERE char *PrintCmd;
 WHERE char *QueryCmd;
 WHERE char *Realname;
-WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 WHERE char *SidebarBoundary;
 WHERE char *SignOffString;
 WHERE char *SimpleSearch;
 
-#if defined(USE_LIBESMTP)
-WHERE char *SmtpAuthUser;
-WHERE char *SmtpAuthPass;
-WHERE char *SmtpHost;
-WHERE unsigned short SmtpPort;
-WHERE char *SmtpUseTLS;
-#endif
 WHERE char *Spoolfile;
 
-WHERE char *SslCertFile INITVAL (NULL);
-WHERE short SslDHPrimeBits;
-WHERE char *SslCACertFile INITVAL (NULL);
 WHERE char *StChars;
 WHERE char *Status;
 WHERE char *Tochars;
@@ -137,11 +107,6 @@ WHERE unsigned char Options[(OPTMAX + 7) / 8];
 /* bit vector for the yes/no/ask variable type */
 WHERE unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
 
-#ifdef USE_NNTP
-WHERE short NewsPollTimeout;
-WHERE short NntpContext;
-#endif
-
 WHERE short ConnectTimeout;
 WHERE short HistSize;
 WHERE short MenuContext;
@@ -156,10 +121,6 @@ WHERE short WriteInc;
 WHERE short MaxDispRecips;
 WHERE short MaxLineLength;
 
-WHERE short ScoreThresholdDelete;
-WHERE short ScoreThresholdRead;
-WHERE short ScoreThresholdFlag;
-
 WHERE short DrawFullLine INITVAL (0);
 WHERE short SidebarWidth;
 
@@ -167,9 +128,10 @@ WHERE short ImapKeepalive;
 WHERE short ImapBuffyTimeout;
 
 /* flags for received signals */
-WHERE SIG_ATOMIC_VOLATILE_T SigAlrm INITVAL (0);
-WHERE SIG_ATOMIC_VOLATILE_T SigInt INITVAL (0);
-WHERE SIG_ATOMIC_VOLATILE_T SigWinch INITVAL (0);
+WHERE sig_atomic_t SigAlrm INITVAL (0);
+WHERE sig_atomic_t SigInt INITVAL (0);
+WHERE sig_atomic_t SigWinch INITVAL (0);
+WHERE sig_atomic_t SigChild INITVAL (0);
 
 WHERE int CurrentMenu;
 
@@ -177,20 +139,9 @@ WHERE string_list_t *UserHeader INITVAL (0);
 
 /*-- formerly in pgp.h --*/
 WHERE char *PgpSignAs;
-WHERE char *PgpEntryFormat;
 
 /*-- formerly in smime.h --*/
 WHERE char *SmimeDefaultKey;
 WHERE char *SmimeCryptAlg;
 
-#ifdef MAIN_C
-const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
-const char *Months[] =
-  { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
-"Nov", "Dec", "ERR" };
-#else
-extern const char *Weekdays[];
-extern const char *Months[];
-#endif
-
 #endif /* !_GLOBALS_H */