#ifndef _GLOBALS_H
#define _GLOBALS_H
-#include "alias.h"
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
-#include <lib-lib/rx.h>
-
-#include "lib/list.h"
-
-WHERE void (*mutt_error) (const char *, ...);
-WHERE void (*mutt_message) (const char *, ...);
+WHERE void (*mutt_error) (const char *, ...) __attribute__((format(printf, 1, 2))) ;
+WHERE void (*mutt_message) (const char *, ...) __attribute__((format(printf, 1, 2))) ;
WHERE CONTEXT *Context;
WHERE char Errorbuf[STRING];
WHERE char AttachmentMarker[STRING];
-WHERE char Quotebuf[SHORT_STRING];
-
-WHERE char *MuttDotlock;
+WHERE char Quotebuf[STRING];
WHERE address_t *EnvFrom;
WHERE address_t *From;
WHERE char *AttachSep;
WHERE char *Attribution;
WHERE char *AttachFormat;
-WHERE char *Charset;
WHERE char *ComposeFormat;
WHERE char *ConfigCharset;
WHERE char *ContentType;
WHERE char *DisplayFilter;
WHERE char *DsnNotify;
WHERE char *DsnReturn;
-WHERE char *Editor;
WHERE char *EditorHeaders;
WHERE char *FileCharset;
WHERE char *FolderFormat;
WHERE char *Tunnel INITVAL (NULL);
WHERE short NetInc;
-#ifdef MIXMASTER
WHERE char *Mixmaster;
WHERE char *MixEntryFormat;
-#endif
WHERE char *OperatingSystem INITVAL (NULL);
WHERE char *QueryCmd;
WHERE char *Realname;
WHERE char *SendCharset;
-WHERE char *Sendmail;
-WHERE char *Shell;
WHERE char *SidebarDelim;
WHERE char *SidebarNumberFormat;
WHERE char *SidebarBoundary;
WHERE string_list_t *MimeLookupList INITVAL (0);
WHERE string_list_t *UnIgnore INITVAL (0);
-WHERE list2_t *Alternates INITVAL (0);
-WHERE list2_t *UnAlternates INITVAL (0);
-WHERE list2_t *MailLists INITVAL (0);
-WHERE list2_t *UnMailLists INITVAL (0);
-WHERE list2_t *SubscribedLists INITVAL (0);
-WHERE list2_t *UnSubscribedLists INITVAL (0);
-WHERE SPAM_LIST *SpamList INITVAL (0);
-WHERE list2_t *NoSpamList INITVAL (0);
+WHERE rx_t *Alternates INITVAL (0);
+WHERE rx_t *UnAlternates INITVAL (0);
+WHERE rx_t *MailLists INITVAL (0);
+WHERE rx_t *UnMailLists INITVAL (0);
+WHERE rx_t *SubscribedLists INITVAL (0);
+WHERE rx_t *UnSubscribedLists INITVAL (0);
+WHERE rx_t *SpamList INITVAL (0);
+WHERE rx_t *NoSpamList INITVAL (0);
/* bit vector for boolean variables */
#ifdef MAIN_C
extern unsigned char QuadOptions[];
#endif
-WHERE unsigned short Counter INITVAL (0);
-
#ifdef USE_NNTP
WHERE short NewsPollTimeout;
WHERE short NntpContext;