X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=e8d498fc3271f07ae7eec79d888201f84adb40ef;hp=fac89945a618ce53fc028897b6fcffb08ca5cc64;hb=fa4c2af84416f9b4663bb80d36faaba35db05524;hpb=c660c8cbae7f647c637502779862e4a36ad6a074

diff --git a/globals.h b/globals.h
index fac8994..e8d498f 100644
--- a/globals.h
+++ b/globals.h
@@ -12,6 +12,8 @@
 #include "alias.h"
 
 #include <lib-lib/str.h>
+#include <lib-lib/date.h>
+
 #include "lib/list.h"
 #include "lib/rx.h"
 
@@ -25,12 +27,10 @@ WHERE char AttachmentMarker[STRING];
 
 WHERE char Quotebuf[SHORT_STRING];
 
-#if defined(DL_STANDALONE) && defined(USE_DOTLOCK)
 WHERE char *MuttDotlock;
-#endif
 
-WHERE ADDRESS *EnvFrom;
-WHERE ADDRESS *From;
+WHERE address_t *EnvFrom;
+WHERE address_t *From;
 
 WHERE char *AliasFile;
 WHERE char *AliasFmt;
@@ -49,7 +49,6 @@ WHERE char *DsnNotify;
 WHERE char *DsnReturn;
 WHERE char *Editor;
 WHERE char *EditorHeaders;
-WHERE char *EscChar;
 WHERE char *FileCharset;
 WHERE char *FolderFormat;
 WHERE char *ForwFmt;
@@ -58,7 +57,6 @@ WHERE char *HdrFmt;
 WHERE char *Homedir;
 WHERE char *Hostname;
 
-#ifdef USE_IMAP
 WHERE char *ImapAuthenticators INITVAL (NULL);
 WHERE char *ImapDelimChars INITVAL (NULL);
 WHERE char *ImapHeaders;
@@ -66,7 +64,6 @@ WHERE char *ImapHomeNamespace INITVAL (NULL);
 WHERE char *ImapLogin INITVAL (NULL);
 WHERE char *ImapPass INITVAL (NULL);
 WHERE char *ImapUser INITVAL (NULL);
-#endif
 WHERE char *Inbox;
 WHERE char *Ispell;
 WHERE char *Locale;
@@ -93,11 +90,9 @@ WHERE rx_t Smileys;
 WHERE rx_t GecosMask;
 WHERE rx_t StripWasRegexp;
 
-#ifdef USE_SOCKET
 WHERE char *Preconnect INITVAL (NULL);
 WHERE char *Tunnel INITVAL (NULL);
 WHERE short NetInc;
-#endif /* USE_SOCKET */
 
 #ifdef MIXMASTER
 WHERE char *Mixmaster;
@@ -122,13 +117,12 @@ WHERE char *Pager;
 WHERE char *PagerFmt;
 WHERE char *PipeSep;
 
-#ifdef USE_POP
 WHERE char *PopAuthenticators INITVAL (NULL);
 WHERE short PopCheckTimeout;
 WHERE char *PopHost;
 WHERE char *PopPass INITVAL (NULL);
 WHERE char *PopUser INITVAL (NULL);
-#endif
+
 WHERE char *PostIndentString;
 WHERE char *Postponed;
 WHERE char *Prefix;
@@ -175,7 +169,6 @@ WHERE char *Tempdir;
 WHERE char *Tochars;
 WHERE char *TrashPath;
 WHERE char *Username;
-WHERE char *Visual;
 WHERE char *XtermTitle;
 WHERE char *XtermLeave;
 WHERE char *XtermIcon;
@@ -246,10 +239,8 @@ WHERE short ScoreThresholdFlag;
 WHERE short DrawFullLine INITVAL (0);
 WHERE short SidebarWidth;
 
-#ifdef USE_IMAP
 WHERE short ImapKeepalive;
 WHERE short ImapBuffyTimeout;
-#endif
 
 /* flags for received signals */
 WHERE SIG_ATOMIC_VOLATILE_T SigAlrm INITVAL (0);