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/.

diff --git a/include/types/lb_chash.h b/include/haproxy/lb_chash-t.h
similarity index 89%
rename from include/types/lb_chash.h
rename to include/haproxy/lb_chash-t.h
index a57a229ca212197260c575430f3404bef0e963b1..ac615b354bc47813f9122cbea870d5c207560013 100644 (file)
--- 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 lb_chash {
        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:

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 0a44967f37317bc294d39717faf876409d73597b..0d6410d40b636acd1139375d283559abf52ac3e4 100644 (file)
--- 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 @@ void chash_init_server_tree(struct proxy *p);
 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:

diff --git a/include/types/backend.h b/include/types/backend.h
index 1e2b9df342c9d0a1695a7387a585eb5fd74f11c8..9f14762ccc75a50ba83840cf2cb280c073cd2dc1 100644 (file)
--- 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>

diff --git a/src/backend.c b/src/backend.c
index f8b8ddb05956e3fbc5b5b0d7a3eb63abb74e04a6..8fe0038ac95acc15266aa3ea292c23c3d310b002 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -25,6 +25,7 @@
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/lb_chash.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -37,7 +38,6 @@
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>
-#include <proto/lb_chash.h>
 #include <proto/lb_fas.h>
 #include <proto/lb_fwlc.h>
 #include <proto/lb_fwrr.h>

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 119a5edc676c2a887f2f6044ed66f6dcdeb33c30..406ac423e75e2519838f85b4ea73676921e4a643 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -43,6 +43,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/frontend.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/lb_chash.h>
 #include <haproxy/mailers-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
@@ -63,7 +64,6 @@
 #include <proto/checks.h>
 #include <proto/stats.h>
 #include <proto/filters.h>
-#include <proto/lb_chash.h>
 #include <proto/lb_fas.h>
 #include <proto/lb_fwlc.h>
 #include <proto/lb_fwrr.h>