Merge branch 'cb/fsmonitor-intfix' into maint

diff --git a/mailinfo.h b/mailinfo.h
index 766c03dd1d29d00beb75b7553fc6717e24978384..79b1d6774ec9ea8a2ef7a6303abb9fc1c917c36f 100644 (file)
--- a/mailinfo.h
+++ b/mailinfo.h
@@ -22,6 +22,8 @@ struct mailinfo {
        struct strbuf *content[MAX_BOUNDARIES];
        struct strbuf **content_top;
        struct strbuf charset;
+       unsigned int format_flowed:1;
+       unsigned int delsp:1;
        char *message_id;
        enum  {
                TE_DONTCARE, TE_QP, TE_BASE64
@@ -37,8 +39,8 @@ struct mailinfo {
        int input_error;
 };
 
-extern void setup_mailinfo(struct mailinfo *);
-extern int mailinfo(struct mailinfo *, const char *msg, const char *patch);
-extern void clear_mailinfo(struct mailinfo *);
+void setup_mailinfo(struct mailinfo *);
+int mailinfo(struct mailinfo *, const char *msg, const char *patch);
+void clear_mailinfo(struct mailinfo *);
 
 #endif /* MAILINFO_H */