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

REORG: include: move lb_fas.h to haproxy/lb_fas{,-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_fas.h b/include/haproxy/lb_fas-t.h
similarity index 89%
rename from include/types/lb_fas.h
rename to include/haproxy/lb_fas-t.h
index 040563e743..e5b1aebd41 100644
--- a/include/types/lb_fas.h
+++ b/include/haproxy/lb_fas-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/lb_fash
+ * include/types/lb_fas-t.h
  * Types for First Available Server load balancing algorithm.
  *
  * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_LB_FAS_H
-#define _TYPES_LB_FAS_H
+#ifndef _HAPROXY_LB_FAS_T_H
+#define _HAPROXY_LB_FAS_T_H
 
-#include <haproxy/api-t.h>
 #include <import/ebtree.h>
 
 struct lb_fas {
@@ -30,7 +29,7 @@ struct lb_fas {
 	struct eb_root bck;	/* weighted least conns on the backup servers */
 };
 
-#endif /* _TYPES_LB_FAS_H */
+#endif /* _HAPROXY_LB_FAS_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/lb_fas.h b/include/haproxy/lb_fas.h
similarity index 88%
rename from include/proto/lb_fas.h
rename to include/haproxy/lb_fas.h
index 4e1f02d1ef..3293db8be3 100644
--- a/include/proto/lb_fas.h
+++ b/include/haproxy/lb_fas.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/lb_fas.h
+ * include/haproxy/lb_fas.h
  * First Available Server 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_FAS_H
-#define _PROTO_LB_FAS_H
+#ifndef _HAPROXY_LB_FAS_H
+#define _HAPROXY_LB_FAS_H
 
 #include <haproxy/api.h>
+#include <haproxy/lb_fas-t.h>
 #include <types/proxy.h>
 #include <types/server.h>
 
 struct server *fas_get_next_server(struct proxy *p, struct server *srvtoavoid);
 void fas_init_server_tree(struct proxy *p);
 
-#endif /* _PROTO_LB_FAS_H */
+#endif /* _HAPROXY_LB_FAS_H */
 
 /*
  * Local variables:
diff --git a/include/types/backend.h b/include/types/backend.h
index 9f14762ccc..b06dfef7c8 100644
--- a/include/types/backend.h
+++ b/include/types/backend.h
@@ -23,10 +23,10 @@
 #define _TYPES_BACKEND_H
 
 #include <haproxy/lb_chash-t.h>
+#include <haproxy/lb_fas-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/thread.h>
 
-#include <types/lb_fas.h>
 #include <types/lb_fwlc.h>
 #include <types/lb_fwrr.h>
 #include <types/lb_map.h>
diff --git a/src/backend.c b/src/backend.c
index 8fe0038ac9..acb80fabea 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -26,6 +26,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/lb_chash.h>
+#include <haproxy/lb_fas.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -38,7 +39,6 @@
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>
-#include <proto/lb_fas.h>
 #include <proto/lb_fwlc.h>
 #include <proto/lb_fwrr.h>
 #include <proto/lb_map.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 406ac423e7..cde7ac00b8 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -44,6 +44,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/lb_chash.h>
+#include <haproxy/lb_fas.h>
 #include <haproxy/mailers-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
@@ -64,7 +65,6 @@
 #include <proto/checks.h>
 #include <proto/stats.h>
 #include <proto/filters.h>
-#include <proto/lb_fas.h>
 #include <proto/lb_fwlc.h>
 #include <proto/lb_fwrr.h>
 #include <proto/lb_map.h>