X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=f2710a99a6975988c39bb6617a51facfa38f70c5;hp=c70cb29dad42c5b0f71cfb03373c8347665edf52;hb=5ef16452ce43a12e467e7004a6a240aefb87a774;hpb=262e2af383382c02b8a3dda72168f6505ddae15f

diff --git a/globals.h b/globals.h
index c70cb29..f2710a9 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);
@@ -112,9 +111,6 @@ 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;
@@ -156,10 +152,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 +159,9 @@ 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 int CurrentMenu;
 
@@ -177,7 +169,6 @@ WHERE string_list_t *UserHeader INITVAL (0);
 
 /*-- formerly in pgp.h --*/
 WHERE char *PgpSignAs;
-WHERE char *PgpEntryFormat;
 
 /*-- formerly in smime.h --*/
 WHERE char *SmimeDefaultKey;