projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix regression, propably due to some changes in the string API
[apps/madmutt.git]
/
mutt.h
diff --git
a/mutt.h
b/mutt.h
index
6d834c5
..
eb23ab5
100644
(file)
--- a/
mutt.h
+++ b/
mutt.h
@@
-41,9
+41,11
@@
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
#include <grp.h>
+#include <lib-lib/buffer.h>
+#include <lib-lib/hash.h>
+#include <lib-lib/list.h>
+
#include "rfc822.h"
#include "rfc822.h"
-#include "list.h"
-#include "hash.h"
#include "charset.h"
#include "lib/rx.h"
#include "charset.h"
#include "lib/rx.h"
@@
-74,13
+76,6
@@
#define M_TOKEN_COMMENT (1<<5) /* don't reap comments */
#define M_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */
#define M_TOKEN_COMMENT (1<<5) /* don't reap comments */
#define M_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */
-typedef struct {
- char *data; /* pointer to data */
- char *dptr; /* current read/write position */
- size_t dsize; /* length of data */
- int destroy; /* destroy `data' when done? */
-} BUFFER;
-
typedef struct {
int ch; /* raw key pressed */
int op; /* function op */
typedef struct {
int ch; /* raw key pressed */
int op; /* function op */
@@
-541,7
+536,7
@@
typedef struct spam_list_t {
} SPAM_LIST;
} SPAM_LIST;
-#define mutt_new_spam_list()
mem_calloc (1, sizeof (SPAM_LIST)
)
+#define mutt_new_spam_list()
p_new(SPAM_LIST, 1
)
void mutt_free_spam_list (SPAM_LIST **);
int mutt_matches_ignore (const char *, LIST *);
void mutt_free_spam_list (SPAM_LIST **);
int mutt_matches_ignore (const char *, LIST *);