* please see the file GPL in the top level source directory.
*/
-#ifndef MUTT_H
-#define MUTT_H
+#ifndef _MUTT_H
+#define _MUTT_H
#include "config.h"
#include "rfc822.h"
#include "hash.h"
#include "charset.h"
+#include "lib/rx.h"
#ifndef HAVE_WC_FUNCS
# ifdef MB_LEN_MAX
#define INITVAL(x)
#endif
-#include "mutt_regex.h"
-
/* flags for mutt_copy_header() */
#define CH_UPDATE 1 /* update the status and x-status fields? */
#define CH_WEED (1<<1) /* weed the headers? */
struct list_t *next;
} LIST;
-typedef struct rx_list_t {
- REGEXP *rx;
- struct rx_list_t *next;
-} RX_LIST;
-
typedef struct spam_list_t {
- REGEXP *rx;
+ rx_t *rx;
int nmatch;
char *template;
struct spam_list_t *next;
#define mutt_new_list() safe_calloc (1, sizeof (LIST))
#define mutt_new_spam_list() safe_calloc (1, sizeof (SPAM_LIST))
-#define mutt_new_rx_list() safe_calloc (1, sizeof (RX_LIST))
void mutt_free_list (LIST **);
-void mutt_free_rx_list (RX_LIST **);
void mutt_free_spam_list (SPAM_LIST **);
LIST *mutt_copy_list (LIST *);
int mutt_matches_ignore (const char *, LIST *);
#include "lib.h"
#include "globals.h"
-#endif /*MUTT_H */
+#endif /* !_MUTT_H */