REORG: check: move email_alert* from proxy-t.h to mailers-t.h

These ones are specific to mailers and have nothing to do in proxy-t.h.

diff --git a/include/haproxy/mailers-t.h b/include/haproxy/mailers-t.h
index b2a3ac3e47ead215fe5a02fdb481367fccde771f..076a9f76d5b60c52966df788694415dd4220db02 100644 (file)
--- a/include/haproxy/mailers-t.h
+++ b/include/haproxy/mailers-t.h
@@ -31,6 +31,11 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <haproxy/check-t.h>
+#include <haproxy/list-t.h>
+#include <haproxy/tcpcheck-t.h>
+#include <haproxy/thread-t.h>
+
 struct mailer {
        char *id;
        struct mailers *mailers;
@@ -45,7 +50,6 @@ struct mailer {
        struct mailer *next;            /* next mailer in the list */
 };
 
-
 struct mailers {
        char *id;                       /* mailers section name */
        struct mailer *mailer_list;     /* mailers in this mailers section */
@@ -61,5 +65,20 @@ struct mailers {
        } timeout;
 };
 
+struct email_alert {
+       struct list list;
+       struct tcpcheck_rules rules;
+       struct server *srv;
+};
+
+struct email_alertq {
+       struct list email_alerts;
+       struct check check;             /* Email alerts are implemented using existing check
+                                        * code even though they are not checks. This structure
+                                        * is as a parameter to the check code.
+                                        * Each check corresponds to a mailer */
+       __decl_thread(HA_SPINLOCK_T lock);
+};
+
 #endif /* _HAPROXY_MAILERS_T_H */
 

diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h
index 507ee705260270e4049d5554a1f3b8eacc7534a1..f4ccaa388dcb2f056184aa8cb31bff6ede5e95ea 100644 (file)
--- a/include/haproxy/proxy-t.h
+++ b/include/haproxy/proxy-t.h
@@ -32,7 +32,6 @@
 
 #include <haproxy/arg-t.h>
 #include <haproxy/backend-t.h>
-#include <haproxy/check-t.h>
 #include <haproxy/counters-t.h>
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/list-t.h>
@@ -251,21 +250,6 @@ struct error_snapshot {
        char buf[0];                    /* copy of the beginning of the message for bufsize bytes */
 };
 
-struct email_alert {
-       struct list list;
-       struct tcpcheck_rules rules;
-       struct server *srv;
-};
-
-struct email_alertq {
-       struct list email_alerts;
-       struct check check;             /* Email alerts are implemented using existing check
-                                        * code even though they are not checks. This structure
-                                        * is as a parameter to the check code.
-                                        * Each check corresponds to a mailer */
-       __decl_thread(HA_SPINLOCK_T lock);
-};
-
 struct proxy {
        enum obj_type obj_type;                 /* object type == OBJ_TYPE_PROXY */
        enum pr_state state;                    /* proxy state, one of PR_* */