well this makes things fail for people ...

[apps/madmutt.git] / globals.h

diff --git a/globals.h b/globals.h
index 22723ed..3a96cae 100644 (file)
--- 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)
-WHERE char *HeaderCachePageSize;
-#endif /* HAVE_GDBM */
-#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,19 +78,11 @@ 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 *StChars;
@@ -134,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;
@@ -153,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;
 
@@ -164,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;
 
@@ -179,14 +144,4 @@ WHERE char *PgpSignAs;
 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 */