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

diff --git a/globals.h b/globals.h
index fac8994..486c361 100644
--- a/globals.h
+++ b/globals.h
@@ -25,12 +25,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;
@@ -93,11 +91,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 +118,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;