#include "alias.h"
-#include "lib/str.h"
+#include <lib-lib/str.h>
#include "lib/list.h"
#include "lib/rx.h"
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;
const char *Months[] =
{ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
"Nov", "Dec", "ERR" };
-
-const char *BodyTypes[] =
- { "x-unknown", "audio", "application", "image", "message", "model",
-"multipart", "text", "video" };
-const char *BodyEncodings[] =
- { "x-unknown", "7bit", "8bit", "quoted-printable", "base64", "binary",
-"x-uuencoded" };
#else
extern const char *Weekdays[];
extern const char *Months[];
#endif
-#ifdef MAIN_C
-/* so that global vars get included
- * FIXME WTF IS THIS?!?!???!?!??!?!??
- */
-#include "mx.h"
-#include "buffy.h"
-#include "sort.h"
-#include "mutt_crypt.h"
-#endif /* MAIN_C */
-
#endif /* !_GLOBALS_H */