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

diff --git a/globals.h b/globals.h
index fac8994..0542e87 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;