commit fbe8da33205550b2a6acf2f2aa6d3a08693d7be2
author Willy Tarreau <w@1wt.eu> Thu Jun 04 14:34:27 2020 +0200
committer Willy Tarreau <w@1wt.eu> Thu Jun 11 10:18:58 2020 +0200
tree 7b930788aad9439d5ea342c7dd07caa31a69db75
parent 52d88725ab3843b7cfaf30726242a334930b1097

REORG: include: move lb_chash.h to haproxy/lb_chash{,-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/.

include/haproxy/lb_chash-t.h

diff --git a/include/types/lb_chash.h b/include/haproxy/lb_chash-t.h
similarity index 88%
rename from include/types/lb_chash.h
rename to include/haproxy/lb_chash-t.h
index a57a229..ac615b3 100644
--- a/include/types/lb_chash.h
+++ b/include/haproxy/lb_chash-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/lb_chash.h
+ * include/haproxy/lb_chash-t.h
  * Types for Consistent Hash LB 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_CHASH_H
-#define _TYPES_LB_CHASH_H
+#ifndef _HAPROXY_LB_CHASH_T_H
+#define _HAPROXY_LB_CHASH_T_H
 
-#include <haproxy/api-t.h>
 #include <import/ebtree.h>
 #include <import/eb32tree.h>
 
@@ -32,7 +31,7 @@
 	struct eb32_node *last;	/* last node found in case of round robin (or NULL) */
 };
 
-#endif /* _TYPES_LB_CHASH_H */
+#endif /* _HAPROXY_LB_CHASH_T_H */
 
 /*
  * Local variables:

include/haproxy/lb_chash.h

diff --git a/include/proto/lb_chash.h b/include/haproxy/lb_chash.h
similarity index 88%
rename from include/proto/lb_chash.h
rename to include/haproxy/lb_chash.h
index 0a44967..0d6410d 100644
--- a/include/proto/lb_chash.h
+++ b/include/haproxy/lb_chash.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/lb_chash.h
+ * include/haproxy/lb_chash.h
  * Function declarations for Consistent Hash LB algorithm.
  *
  * Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_LB_CHASH_H
-#define _PROTO_LB_CHASH_H
+#ifndef _HAPROXY_LB_CHASH_H
+#define _HAPROXY_LB_CHASH_H
 
 #include <haproxy/api.h>
+#include <haproxy/lb_chash-t.h>
 #include <types/proxy.h>
 #include <types/server.h>
 
@@ -30,7 +31,7 @@
 struct server *chash_get_next_server(struct proxy *p, struct server *srvtoavoid);
 struct server *chash_get_server_hash(struct proxy *p, unsigned int hash, const struct server *avoid);
 
-#endif /* _PROTO_LB_CHASH_H */
+#endif /* _HAPROXY_LB_CHASH_H */
 
 /*
  * Local variables:

include/types/backend.h

diff --git a/include/types/backend.h b/include/types/backend.h
index 1e2b9df..9f14762 100644
--- a/include/types/backend.h
+++ b/include/types/backend.h
@@ -22,10 +22,10 @@
 #ifndef _TYPES_BACKEND_H
 #define _TYPES_BACKEND_H
 
+#include <haproxy/lb_chash-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/thread.h>
 
-#include <types/lb_chash.h>
 #include <types/lb_fas.h>
 #include <types/lb_fwlc.h>
 #include <types/lb_fwrr.h>