X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=db9609696492da0baef84eb169f90772382c796c;hp=7a624d9e7a57ba4e2a0cc4336764cbda66a7776f;hb=b8c71f93b0296f815a6538182343ba67e88c0012;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/globals.h b/globals.h
index 7a624d9..db96096 100644
--- a/globals.h
+++ b/globals.h
@@ -25,9 +25,7 @@ WHERE char AttachmentMarker[STRING];
 
 WHERE char Quotebuf[SHORT_STRING];
 
-#if defined(DL_STANDALONE) && defined(USE_DOTLOCK)
 WHERE char *MuttDotlock;
-#endif
 
 WHERE address_t *EnvFrom;
 WHERE address_t *From;
@@ -58,7 +56,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 +63,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 +89,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 +116,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;
@@ -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);