#include "alias.h"
-#include "lib/str.h"
+#include <lib-lib/str.h>
+#include <lib-lib/date.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;
WHERE char *DsnReturn;
WHERE char *Editor;
WHERE char *EditorHeaders;
-WHERE char *EscChar;
WHERE char *FileCharset;
WHERE char *FolderFormat;
WHERE char *ForwFmt;
WHERE char *Homedir;
WHERE char *Hostname;
-#ifdef USE_IMAP
WHERE char *ImapAuthenticators INITVAL (NULL);
WHERE char *ImapDelimChars INITVAL (NULL);
WHERE char *ImapHeaders;
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;
#ifdef USE_HCACHE
WHERE char *HeaderCache;
-#if HAVE_GDBM || HAVE_DB4
+#if defined(HAVE_GDBM) || defined(HAVE_DB4)
WHERE char *HeaderCachePageSize;
#endif /* HAVE_GDBM || HAVE_DB4 */
#endif /* USE_HCACHE */
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;
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;
WHERE char *Tochars;
WHERE char *TrashPath;
WHERE char *Username;
-WHERE char *Visual;
WHERE char *XtermTitle;
WHERE char *XtermLeave;
WHERE char *XtermIcon;
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);
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 */