X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=2aea9ea0e9fc690eb02f9bf90749fcedad1bf22f;hp=7e59c1ee486bdbc35a775168a9cbf5e6366efa46;hb=c50162101b316e88b95dc4259d45a259b38a972e;hpb=4f1b1414371cc373f50ca79a888928635a3a3763

diff --git a/globals.h b/globals.h
index 7e59c1e..2aea9ea 100644
--- a/globals.h
+++ b/globals.h
@@ -153,10 +153,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 +160,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;
 
@@ -174,7 +170,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;