REORG: include: move lb_fwlc.h to haproxy/lb_fwlc{,-t}.h
Nothing fancy, includes were already OK. The proto didn't reference the
type, this was fixed. Still references proxy.h and server.h from types/.
diff --git a/include/types/lb_fwlc.h b/include/haproxy/lb_fwlc-t.h
similarity index 88%
rename from include/types/lb_fwlc.h
rename to include/haproxy/lb_fwlc-t.h
index c87d61e..e5064be 100644
--- a/include/types/lb_fwlc.h
+++ b/include/haproxy/lb_fwlc-t.h
@@ -1,5 +1,5 @@
/*
- * include/types/lb_fwlc.h
+ * include/haproxy/lb_fwlc-t.h
* Types for Fast Weighted Least Connection load balancing algorithm.
*
* Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TYPES_LB_FWLC_H
-#define _TYPES_LB_FWLC_H
+#ifndef _HAPROXY_LB_FWLC_T_H
+#define _HAPROXY_LB_FWLC_T_H
-#include <haproxy/api-t.h>
#include <import/ebtree.h>
struct lb_fwlc {
@@ -30,7 +29,7 @@
struct eb_root bck; /* weighted least conns on the backup servers */
};
-#endif /* _TYPES_LB_FWLC_H */
+#endif /* _HAPROXY_LB_FWLC_T_H */
/*
* Local variables:
diff --git a/include/proto/lb_fwlc.h b/include/haproxy/lb_fwlc.h
similarity index 88%
rename from include/proto/lb_fwlc.h
rename to include/haproxy/lb_fwlc.h
index a7a46ff..5a549e3 100644
--- a/include/proto/lb_fwlc.h
+++ b/include/haproxy/lb_fwlc.h
@@ -1,5 +1,5 @@
/*
- * include/proto/lb_fwlc.h
+ * include/haproxy/lb_fwlc.h
* Fast Weighted Least Connection load balancing algorithm.
*
* Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
@@ -19,17 +19,18 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _PROTO_LB_FWLC_H
-#define _PROTO_LB_FWLC_H
+#ifndef _HAPROXY_LB_FWLC_H
+#define _HAPROXY_LB_FWLC_H
#include <haproxy/api.h>
+#include <haproxy/lb_fwlc-t.h>
#include <types/proxy.h>
#include <types/server.h>
struct server *fwlc_get_next_server(struct proxy *p, struct server *srvtoavoid);
void fwlc_init_server_tree(struct proxy *p);
-#endif /* _PROTO_LB_FWLC_H */
+#endif /* _HAPROXY_LB_FWLC_H */
/*
* Local variables:
diff --git a/include/types/backend.h b/include/types/backend.h
index b06dfef..19a45f0 100644
--- a/include/types/backend.h
+++ b/include/types/backend.h
@@ -24,10 +24,10 @@
#include <haproxy/lb_chash-t.h>
#include <haproxy/lb_fas-t.h>
+#include <haproxy/lb_fwlc-t.h>
#include <haproxy/api-t.h>
#include <haproxy/thread.h>
-#include <types/lb_fwlc.h>
#include <types/lb_fwrr.h>
#include <types/lb_map.h>
#include <types/server.h>
diff --git a/src/backend.c b/src/backend.c
index acb80fa..bbf9672 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -27,6 +27,7 @@
#include <haproxy/htx.h>
#include <haproxy/lb_chash.h>
#include <haproxy/lb_fas.h>
+#include <haproxy/lb_fwlc.h>
#include <haproxy/obj_type.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
@@ -39,7 +40,6 @@
#include <proto/backend.h>
#include <proto/channel.h>
#include <proto/checks.h>
-#include <proto/lb_fwlc.h>
#include <proto/lb_fwrr.h>
#include <proto/lb_map.h>
#include <proto/log.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index cde7ac0..6571b85 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -45,6 +45,7 @@
#include <haproxy/http_rules.h>
#include <haproxy/lb_chash.h>
#include <haproxy/lb_fas.h>
+#include <haproxy/lb_fwlc.h>
#include <haproxy/mailers-t.h>
#include <haproxy/obj_type-t.h>
#include <haproxy/pool.h>
@@ -65,7 +66,6 @@
#include <proto/checks.h>
#include <proto/stats.h>
#include <proto/filters.h>
-#include <proto/lb_fwlc.h>
#include <proto/lb_fwrr.h>
#include <proto/lb_map.h>
#include <proto/listener.h>