From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 12:45:03 +0000 (+0200)
Subject: REORG: include: move lb_fwrr.h to haproxy/lb_fwrr{,-t}.h
X-Git-Tag: v2.2-dev9~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=546ba42c7339d0d672c3a0a92d505693520785b4;p=thirdparty%2Fhaproxy.git

REORG: include: move lb_fwrr.h to haproxy/lb_fwrr{,-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_fwrr.h b/include/haproxy/lb_fwrr-t.h
similarity index 92%
rename from include/types/lb_fwrr.h
rename to include/haproxy/lb_fwrr-t.h
index 6a2a04c205..0e12e1ba0b 100644
--- a/include/types/lb_fwrr.h
+++ b/include/haproxy/lb_fwrr-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/lb_fwrr.h
+ * include/haproxy/lb_fwrr-t.h
  * Types for Fast Weighted Round Robin 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_FWRR_H
-#define _TYPES_LB_FWRR_H
+#ifndef _HAPROXY_LB_FWRR_T_H
+#define _HAPROXY_LB_FWRR_T_H
 
-#include <haproxy/api-t.h>
 #include <import/ebtree.h>
 
 /* This structure is used to apply fast weighted round robin on a server group */
@@ -41,7 +40,7 @@ struct lb_fwrr {
 	struct fwrr_group bck;	/* weighted round robin on the backup servers */
 };
 
-#endif /* _TYPES_LB_FWRR_H */
+#endif /* _HAPROXY_LB_FWRR_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/lb_fwrr.h b/include/haproxy/lb_fwrr.h
similarity index 88%
rename from include/proto/lb_fwrr.h
rename to include/haproxy/lb_fwrr.h
index c23a4710b8..af389966e5 100644
--- a/include/proto/lb_fwrr.h
+++ b/include/haproxy/lb_fwrr.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/lb_fwrr.h
+ * include/haproxy/lb_fwrr.h
  * Fast Weighted Round Robin 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_FWRR_H
-#define _PROTO_LB_FWRR_H
+#ifndef _HAPROXY_LB_FWRR_H
+#define _HAPROXY_LB_FWRR_H
 
 #include <haproxy/api.h>
+#include <haproxy/lb_fwrr-t.h>
 #include <types/proxy.h>
 #include <types/server.h>
 
 void fwrr_init_server_groups(struct proxy *p);
 struct server *fwrr_get_next_server(struct proxy *p, struct server *srvtoavoid);
 
-#endif /* _PROTO_LB_FWRR_H */
+#endif /* _HAPROXY_LB_FWRR_H */
 
 /*
  * Local variables:
diff --git a/include/types/backend.h b/include/types/backend.h
index 19a45f033c..8a1f3bd11d 100644
--- a/include/types/backend.h
+++ b/include/types/backend.h
@@ -25,10 +25,10 @@
 #include <haproxy/lb_chash-t.h>
 #include <haproxy/lb_fas-t.h>
 #include <haproxy/lb_fwlc-t.h>
+#include <haproxy/lb_fwrr-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/thread.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 bbf9672317..0d18e15f31 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -28,6 +28,7 @@
 #include <haproxy/lb_chash.h>
 #include <haproxy/lb_fas.h>
 #include <haproxy/lb_fwlc.h>
+#include <haproxy/lb_fwrr.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -40,7 +41,6 @@
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>
-#include <proto/lb_fwrr.h>
 #include <proto/lb_map.h>
 #include <proto/log.h>
 #include <proto/payload.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 6571b85de0..99c5c24a4a 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -46,6 +46,7 @@
 #include <haproxy/lb_chash.h>
 #include <haproxy/lb_fas.h>
 #include <haproxy/lb_fwlc.h>
+#include <haproxy/lb_fwrr.h>
 #include <haproxy/mailers-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
@@ -66,7 +67,6 @@
 #include <proto/checks.h>
 #include <proto/stats.h>
 #include <proto/filters.h>
-#include <proto/lb_fwrr.h>
 #include <proto/lb_map.h>
 #include <proto/listener.h>
 #include <proto/log.h>