REORG: ebtree: move the include files from ebtree to include/import/

This is where other imported components are located. All files which
used to directly include ebtree were touched to update their include
path so that "import/" is now prefixed before the ebtree-related files.

The ebtree.h file was slightly adjusted to read compiler.h from the
common/ subdirectory (this is the only change).

A build issue was encountered when eb32sctree.h is loaded before
eb32tree.h because only the former checks for the latter before
defining type u32. This was addressed by adding the reverse ifdef
in eb32tree.h.

No further cleanup was done yet in order to keep changes minimal.

diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c
index 3c785fc0935534277ac1fffa77a00fb52a6868cc..59b728274f15444f4cfa3495bbdb0499e7064426 100644 (file)
--- a/contrib/halog/halog.c
+++ b/contrib/halog/halog.c
@@ -20,10 +20,10 @@
 #include <ctype.h>
 #include <time.h>
 
-#include <eb32tree.h>
-#include <eb64tree.h>
-#include <ebistree.h>
-#include <ebsttree.h>
+#include <import/eb32tree.h>
+#include <import/eb64tree.h>
+#include <import/ebistree.h>
+#include <import/ebsttree.h>
 
 #define SOURCE_FIELD 5
 #define ACCEPT_FIELD 6

diff --git a/include/common/namespace.h b/include/common/namespace.h
index 41931ff6d3d935f6bd7fbce067f52d141e921da0..596aac344ed7996b58d267613a2c6022a5a1545b 100644 (file)
--- a/include/common/namespace.h
+++ b/include/common/namespace.h
@@ -2,7 +2,7 @@
 #define _NAMESPACE_H
 
 #include <stdlib.h>
-#include <ebistree.h>
+#include <import/ebistree.h>
 
 #ifdef USE_NS
 

diff --git a/include/common/standard.h b/include/common/standard.h
index 40991fa45127363da17d199ef771410132ea4c50..3f6f95438d39c1d99b8608d52a9852378b5cca4b 100644 (file)
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -41,8 +41,8 @@
 #include <common/chunk.h>
 #include <common/config.h>
 #include <common/namespace.h>
-#include <eb32tree.h>
-#include <eb32sctree.h>
+#include <import/eb32tree.h>
+#include <import/eb32sctree.h>
 #include <types/protocol.h>
 
 /* size used for max length of decimal representation of long long int. */

diff --git a/ebtree/eb32sctree.h b/include/import/eb32sctree.h
similarity index 100%
rename from ebtree/eb32sctree.h
rename to include/import/eb32sctree.h

diff --git a/ebtree/eb32tree.h b/include/import/eb32tree.h
similarity index 99%
rename from ebtree/eb32tree.h
rename to include/import/eb32tree.h
index 3896fb81bca82e011caebcb294d0dd567317039d..76f9eaacb5b73f6efc1e454c080aad2e69532839 100644 (file)
--- a/ebtree/eb32tree.h
+++ b/include/import/eb32tree.h
@@ -31,8 +31,10 @@
 #define EB32_TREE_HEAD EB_TREE_HEAD
 
 /* These types may sometimes already be defined */
+#ifndef _EB32SCTREE_H
 typedef unsigned int u32;
 typedef   signed int s32;
+#endif
 
 /* This structure carries a node, a leaf, and a key. It must start with the
  * eb_node so that it can be cast into an eb_node. We could also have put some

diff --git a/ebtree/eb64tree.h b/include/import/eb64tree.h
similarity index 100%
rename from ebtree/eb64tree.h
rename to include/import/eb64tree.h

diff --git a/ebtree/ebimtree.h b/include/import/ebimtree.h
similarity index 100%
rename from ebtree/ebimtree.h
rename to include/import/ebimtree.h

diff --git a/ebtree/ebistree.h b/include/import/ebistree.h
similarity index 100%
rename from ebtree/ebistree.h
rename to include/import/ebistree.h

diff --git a/ebtree/ebmbtree.h b/include/import/ebmbtree.h
similarity index 100%
rename from ebtree/ebmbtree.h
rename to include/import/ebmbtree.h

diff --git a/ebtree/ebpttree.h b/include/import/ebpttree.h
similarity index 100%
rename from ebtree/ebpttree.h
rename to include/import/ebpttree.h

diff --git a/ebtree/ebsttree.h b/include/import/ebsttree.h
similarity index 100%
rename from ebtree/ebsttree.h
rename to include/import/ebsttree.h

diff --git a/ebtree/ebtree.h b/include/import/ebtree.h
similarity index 99%
rename from ebtree/ebtree.h
rename to include/import/ebtree.h
index dff044b3902d595ad9e99e5058069e08e7329c5d..9e5daca48a02b81dbb16188f5fd606d06ea1cd4c 100644 (file)
--- a/ebtree/ebtree.h
+++ b/include/import/ebtree.h
@@ -247,7 +247,7 @@
 #define _EBTREE_H
 
 #include <stdlib.h>
-#include "compiler.h"
+#include <common/compiler.h>
 
 static inline int flsnz8_generic(unsigned int x)
 {

diff --git a/include/import/lru.h b/include/import/lru.h
index 7427fd627ba8ef4cbd772a72402c3474945a1ea7..d674e534872fe0791d276611e696b7e370d8caa7 100644 (file)
--- a/include/import/lru.h
+++ b/include/import/lru.h
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <eb64tree.h>
+#include <import/eb64tree.h>
 
 /* The LRU supports a global cache shared between multiple domains and multiple
  * versions of their datasets. The purpose is not to have to flush the whole

diff --git a/include/proto/task.h b/include/proto/task.h
index 07da99d6c2e943886fee90f214c7ff0b1c2e9f1d..52b284d0f7b32751a40d451fa309a84bad7874d0 100644 (file)
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -32,8 +32,8 @@
 #include <common/ticks.h>
 #include <common/hathreads.h>
 
-#include <eb32sctree.h>
-#include <eb32tree.h>
+#include <import/eb32sctree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/task.h>

diff --git a/include/types/acl.h b/include/types/acl.h
index 04318ea04c3d2937beb2d85650ef73d708157346..f5d385896ab1c29b0115fa582c05c776223b2905 100644 (file)
--- a/include/types/acl.h
+++ b/include/types/acl.h
@@ -32,7 +32,7 @@
 #include <types/proxy.h>
 #include <types/server.h>
 
-#include <ebmbtree.h>
+#include <import/ebmbtree.h>
 
 /* ACL test result.
  *

diff --git a/include/types/checks.h b/include/types/checks.h
index 27ce72dda99a4a63ccb6a5893281bf202c225e88..a23091cc2d601d60a83beb85d4d59bcf33e3bcfc 100644 (file)
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -13,7 +13,7 @@
 #ifndef _TYPES_CHECKS_H
 #define _TYPES_CHECKS_H
 
-#include <ebpttree.h>
+#include <import/ebpttree.h>
 
 #include <common/standard.h>
 #include <common/config.h>

diff --git a/include/types/dict.h b/include/types/dict.h
index 006e91524db414ee1208a955725859c5234661ac..30953f6cee9d4a4ebd67e3dea70e46cc90df0a46 100644 (file)
--- a/include/types/dict.h
+++ b/include/types/dict.h
@@ -2,7 +2,7 @@
 #define _TYPES_DICT_H
 
 #include <common/hathreads.h>
-#include <ebpttree.h>
+#include <import/ebpttree.h>
 
 struct dict_entry {
        struct ebpt_node value;

diff --git a/include/types/dns.h b/include/types/dns.h
index 9926de0c7e6ea98fea68deae693c8e1c7a72e72d..06afda8b8c62d79e80b2ff74b99c01d67ca3b076 100644 (file)
--- a/include/types/dns.h
+++ b/include/types/dns.h
@@ -22,7 +22,7 @@
 #ifndef _TYPES_DNS_H
 #define _TYPES_DNS_H
 
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <common/mini-clist.h>
 #include <common/hathreads.h>

diff --git a/include/types/fcgi-app.h b/include/types/fcgi-app.h
index f9e399f51c20fd91485da83589dc107d4123d6c7..d7beb2602d6c83000b749f6f4887e91522b42e6a 100644 (file)
--- a/include/types/fcgi-app.h
+++ b/include/types/fcgi-app.h
@@ -28,7 +28,7 @@
 #include <common/mini-clist.h>
 #include <common/regex.h>
 
-#include <ebistree.h>
+#include <import/ebistree.h>
 
 #include <types/acl.h>
 #include <types/filters.h>

diff --git a/include/types/http_htx.h b/include/types/http_htx.h
index 42b3c39ed5fe0cd738faccf7aee98eb904250b21..301034c8f530ea28d4cb38aa65c30c428322953e 100644 (file)
--- a/include/types/http_htx.h
+++ b/include/types/http_htx.h
@@ -23,7 +23,7 @@
 #ifndef _TYPES_HTTP_HTX_H
 #define _TYPES_HTTP_HTX_H
 
-#include <ebistree.h>
+#include <import/ebistree.h>
 
 #include <common/buf.h>
 #include <common/http.h>

diff --git a/include/types/lb_chash.h b/include/types/lb_chash.h
index 5991ce961b7a519bea707b7ff46b0883d01656dd..9486064dd8679ec9a1740f794feedffecf0d10e3 100644 (file)
--- a/include/types/lb_chash.h
+++ b/include/types/lb_chash.h
@@ -23,8 +23,8 @@
 #define _TYPES_LB_CHASH_H
 
 #include <common/config.h>
-#include <ebtree.h>
-#include <eb32tree.h>
+#include <import/ebtree.h>
+#include <import/eb32tree.h>
 
 struct lb_chash {
        struct eb_root act;     /* weighted chash entries of active servers */

diff --git a/include/types/lb_fas.h b/include/types/lb_fas.h
index 4590a9636ec5d134ee3125823ef0e5ae5747ca29..e20d70a27998a2f9c94e6c76c15f24dd987ed620 100644 (file)
--- a/include/types/lb_fas.h
+++ b/include/types/lb_fas.h
@@ -23,7 +23,7 @@
 #define _TYPES_LB_FAS_H
 
 #include <common/config.h>
-#include <ebtree.h>
+#include <import/ebtree.h>
 
 struct lb_fas {
        struct eb_root act;     /* weighted least conns on the active servers */

diff --git a/include/types/lb_fwlc.h b/include/types/lb_fwlc.h
index 170eb241c590851d3dc0935c367b56108fb98e1d..f20659a71a9b503652f901d7c752c6436aa3738d 100644 (file)
--- a/include/types/lb_fwlc.h
+++ b/include/types/lb_fwlc.h
@@ -23,7 +23,7 @@
 #define _TYPES_LB_FWLC_H
 
 #include <common/config.h>
-#include <ebtree.h>
+#include <import/ebtree.h>
 
 struct lb_fwlc {
        struct eb_root act;     /* weighted least conns on the active servers */

diff --git a/include/types/lb_fwrr.h b/include/types/lb_fwrr.h
index 731f055f9db157a46285e02ef7f6bceecfe9e229..754d0c64b1298afacee9d4a200549d26729afb68 100644 (file)
--- a/include/types/lb_fwrr.h
+++ b/include/types/lb_fwrr.h
@@ -23,7 +23,7 @@
 #define _TYPES_LB_FWRR_H
 
 #include <common/config.h>
-#include <ebtree.h>
+#include <import/ebtree.h>
 
 /* This structure is used to apply fast weighted round robin on a server group */
 struct fwrr_group {

diff --git a/include/types/listener.h b/include/types/listener.h
index b815cc337af0edd54343f823a6a6ee931223d97b..d035a90fc01117fc180ef3e66ccfa193578d5e76 100644 (file)
--- a/include/types/listener.h
+++ b/include/types/listener.h
@@ -34,7 +34,7 @@
 #include <common/hathreads.h>
 
 #include <types/obj_type.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 /* Some pointer types reference below */
 struct task;

diff --git a/include/types/pattern.h b/include/types/pattern.h
index 9ed6b4b736af6472d6420d168ed7234f19de11e1..f4c0a1323ceca8eea400223aa2e8fb9529be06c7 100644 (file)
--- a/include/types/pattern.h
+++ b/include/types/pattern.h
@@ -29,7 +29,7 @@
 
 #include <types/sample.h>
 
-#include <ebmbtree.h>
+#include <import/ebmbtree.h>
 
 /* Pattern matching function result.
  *

diff --git a/include/types/peers.h b/include/types/peers.h
index 89962a37b55d27aedcd46b414d58653e547925d5..78270bf245400d8f23a2385ac272978dff623d1a 100644 (file)
--- a/include/types/peers.h
+++ b/include/types/peers.h
@@ -31,7 +31,7 @@
 #include <common/mini-clist.h>
 #include <common/regex.h>
 #include <common/tools.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/dict.h>
 

diff --git a/include/types/protocol.h b/include/types/protocol.h
index 39f99cae3645402b5695452c897b1274fb6dcf10..10437a7b11a4c043f329e0dfc42f7430b738409d 100644 (file)
--- a/include/types/protocol.h
+++ b/include/types/protocol.h
@@ -27,7 +27,7 @@
 
 #include <common/config.h>
 #include <common/mini-clist.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 /* some pointer types referenced below */
 struct listener;

diff --git a/include/types/proxy.h b/include/types/proxy.h
index c136ecb4cb8afda6b33f63514cd675c0e394af5c..a9adce0b57dc0b0d9f3c3f29f5901223ed48794a 100644 (file)
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -35,8 +35,8 @@
 #include <common/tools.h>
 #include <common/hathreads.h>
 
-#include <eb32tree.h>
-#include <ebistree.h>
+#include <import/eb32tree.h>
+#include <import/ebistree.h>
 
 #include <types/acl.h>
 #include <types/backend.h>

diff --git a/include/types/server.h b/include/types/server.h
index 7b1ae5f9cc5a12e127b1d807ea5b9f77f04bcb0e..376fc0321f2e0ab1dc02952981366be2f5d184dd 100644 (file)
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -30,7 +30,7 @@
 #include <common/hathreads.h>
 #include <common/openssl-compat.h>
 
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/connection.h>
 #include <types/counters.h>

diff --git a/include/types/ssl_crtlist.h b/include/types/ssl_crtlist.h
index 095a1279db2cc50e7d6f0f7d8941a12a1f8b106e..2879d745c3d89f36634118668fe3e1bd54eb4c2f 100644 (file)
--- a/include/types/ssl_crtlist.h
+++ b/include/types/ssl_crtlist.h
@@ -23,7 +23,7 @@
 #define _TYPES_SSL_CRTLIST_H
 #ifdef USE_OPENSSL
 
-#include <ebmbtree.h>
+#include <import/ebmbtree.h>
 
 #include <common/mini-clist.h>
 

diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h
index 78639ac1083e0b906727c5412a235f3458e98d04..aed6e6ce863c15348b38b65ba2af8de6f03553ce 100644 (file)
--- a/include/types/ssl_sock.h
+++ b/include/types/ssl_sock.h
@@ -23,9 +23,9 @@
 #define _TYPES_SSL_SOCK_H
 #ifdef USE_OPENSSL
 
-#include <ebpttree.h>
-#include <ebmbtree.h>
-#include <eb64tree.h>
+#include <import/ebpttree.h>
+#include <import/ebmbtree.h>
+#include <import/eb64tree.h>
 
 #include <types/connection.h> /* struct wait_event */
 #include <types/ssl_ckch.h>

diff --git a/include/types/stick_table.h b/include/types/stick_table.h
index 5e15aaaa47802b9231ea583b2c3f197d173a3acf..832ecd25a204bf30eabaa72d9cad882a59a9a8cb 100644 (file)
--- a/include/types/stick_table.h
+++ b/include/types/stick_table.h
@@ -26,9 +26,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <ebtree.h>
-#include <ebmbtree.h>
-#include <eb32tree.h>
+#include <import/ebtree.h>
+#include <import/ebmbtree.h>
+#include <import/eb32tree.h>
 #include <common/memory.h>
 #include <types/dict.h>
 #include <types/freq_ctr.h>

diff --git a/include/types/task.h b/include/types/task.h
index 6ca97671f01bc31de34b984b50eb037acf7e676d..0fba89898429bc73f333d49b5d8641061ef5a5ea 100644 (file)
--- a/include/types/task.h
+++ b/include/types/task.h
@@ -26,8 +26,8 @@
 
 #include <common/config.h>
 #include <common/mini-clist.h>
-#include <eb32sctree.h>
-#include <eb32tree.h>
+#include <import/eb32sctree.h>
+#include <import/eb32tree.h>
 
 /* values for task->state */
 #define TASK_SLEEPING     0x0000  /* task sleeping */

diff --git a/src/acl.c b/src/acl.c
index fa8ae923803bb858fab58ad67b046a40c66f338a..7df433d4ab84c0b3d47f1479c6e4ab0b5ec571c4 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -32,7 +32,7 @@
 #include <proto/sample.h>
 #include <proto/stick_table.h>
 
-#include <ebsttree.h>
+#include <import/ebsttree.h>
 
 /* List head of all known ACL keywords */
 static struct acl_kw_list acl_keywords = {

diff --git a/src/cache.c b/src/cache.c
index ed50b29b66c9ebe18436243a84bf0b7c5be225df..f68cb14169efefc07e05459cbab33276c397dc50 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -10,7 +10,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 #include <import/sha1.h>
 
 #include <types/action.h>

diff --git a/src/dict.c b/src/dict.c
index 2da564b15f88cbc6926553d897a8a7489f366266..7a9e25fa7e442ed80a991f2e4792fde57d876191 100644 (file)
--- a/src/dict.c
+++ b/src/dict.c
@@ -2,8 +2,8 @@
 
 #include <proto/dict.h>
 
-#include <eb32tree.h>
-#include <ebistree.h>
+#include <import/eb32tree.h>
+#include <import/ebistree.h>
 
 struct dict *new_dict(const char *name)
 {

diff --git a/src/eb32sctree.c b/src/eb32sctree.c
index 14e59801809c65acb6abdb9ab7310d05307cdcc5..af6a539482e6a02ccfa4376dfdce04c6d1df8dd0 100644 (file)
--- a/src/eb32sctree.c
+++ b/src/eb32sctree.c
@@ -20,7 +20,7 @@
 
 /* Consult eb32sctree.h for more details about those functions */
 
-#include "eb32sctree.h"
+#include <import/eb32sctree.h>
 
 
 /* This function is used to build a tree of duplicates by adding a new node to

diff --git a/src/eb32tree.c b/src/eb32tree.c
index 77e4793f1e75f2a41dc27dc422d7a461b274b88f..38ddab00d8abdac3c90c91574237d5c4be6c0736 100644 (file)
--- a/src/eb32tree.c
+++ b/src/eb32tree.c
@@ -20,7 +20,7 @@
 
 /* Consult eb32tree.h for more details about those functions */
 
-#include "eb32tree.h"
+#include <import/eb32tree.h>
 
 struct eb32_node *eb32_insert(struct eb_root *root, struct eb32_node *new)
 {

diff --git a/src/eb64tree.c b/src/eb64tree.c
index 442e973a8ef8fdda72661a34f8617ef27d7bb435..b908d4db274f85907606c39e7d1bae95182b1515 100644 (file)
--- a/src/eb64tree.c
+++ b/src/eb64tree.c
@@ -20,7 +20,7 @@
 
 /* Consult eb64tree.h for more details about those functions */
 
-#include "eb64tree.h"
+#include <import/eb64tree.h>
 
 struct eb64_node *eb64_insert(struct eb_root *root, struct eb64_node *new)
 {

diff --git a/src/ebimtree.c b/src/ebimtree.c
index 3e6a7ce267ab934a136fa75546ed99f2cc58ad75..e6b82cc364801195acb30b51a28191093240544e 100644 (file)
--- a/src/ebimtree.c
+++ b/src/ebimtree.c
@@ -20,8 +20,8 @@
 
 /* Consult ebimtree.h for more details about those functions */
 
-#include "ebpttree.h"
-#include "ebimtree.h"
+#include <import/ebpttree.h>
+#include <import/ebimtree.h>
 
 /* Find the first occurrence of a key of <len> bytes in the tree <root>.
  * If none can be found, return NULL.

diff --git a/src/ebistree.c b/src/ebistree.c
index 6ad5e95f4d07c01c7b2930ae5a387409021ce082..193950d1fb5b5867348edcdadf5d33d31b8e80e0 100644 (file)
--- a/src/ebistree.c
+++ b/src/ebistree.c
@@ -20,7 +20,7 @@
 
 /* Consult ebistree.h for more details about those functions */
 
-#include "ebistree.h"
+#include <import/ebistree.h>
 
 /* Find the first occurrence of a zero-terminated string <x> in the tree <root>.
  * It's the caller's responsibility to use this function only on trees which

diff --git a/src/ebmbtree.c b/src/ebmbtree.c
index ceedefce38f4e36d108dec17a67d039a1150f42d..4a1bfc5682dd58a55bb9360118853b4fce95f83e 100644 (file)
--- a/src/ebmbtree.c
+++ b/src/ebmbtree.c
@@ -20,7 +20,7 @@
 
 /* Consult ebmbtree.h for more details about those functions */
 
-#include "ebmbtree.h"
+#include <import/ebmbtree.h>
 
 /* Find the first occurrence of a key of <len> bytes in the tree <root>.
  * If none can be found, return NULL.

diff --git a/src/ebpttree.c b/src/ebpttree.c
index a7e6b06f54ec6be29982aa3d9a437222b38482c8..558d334a4de445f560de82ae02b6790adb3a8c2e 100644 (file)
--- a/src/ebpttree.c
+++ b/src/ebpttree.c
@@ -20,7 +20,7 @@
 
 /* Consult ebpttree.h for more details about those functions */
 
-#include "ebpttree.h"
+#include <import/ebpttree.h>
 
 struct ebpt_node *ebpt_insert(struct eb_root *root, struct ebpt_node *new)
 {

diff --git a/src/ebsttree.c b/src/ebsttree.c
index 12469cc1faab4f98eb9385d4727c9d18fb251609..a4fbe33737a1c576021013c1de55f9d1a9ebdd54 100644 (file)
--- a/src/ebsttree.c
+++ b/src/ebsttree.c
@@ -20,7 +20,7 @@
 
 /* Consult ebsttree.h for more details about those functions */
 
-#include "ebsttree.h"
+#include <import/ebsttree.h>
 
 /* Find the first occurrence of a zero-terminated string <x> in the tree <root>.
  * It's the caller's responsibility to use this function only on trees which

diff --git a/src/ebtree.c b/src/ebtree.c
index d60c799574d405b98f3dae8c32ac48f87c1fdbd8..3b904209d4072de6c09c15a68d9d7dc936cf87d9 100644 (file)
--- a/src/ebtree.c
+++ b/src/ebtree.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ebtree.h"
+#include <import/ebtree.h>
 
 void eb_delete(struct eb_node *node)
 {

diff --git a/src/hlua.c b/src/hlua.c
index d7afb5817aa846f5edc448b3b74edfdfb8c0184c..83cc3cd2e490074f2e546d4b237dfc52b03d5f0b 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -22,7 +22,7 @@
 #error "Requires Lua 5.3 or later."
 #endif
 
-#include <ebpttree.h>
+#include <import/ebpttree.h>
 
 #include <common/cfgparse.h>
 #include <common/compiler.h>

diff --git a/src/lb_chash.c b/src/lb_chash.c
index 23448df80a799bd2ab0c33fc71afaefb054b4f79..91724fdaf23141352f550d4ee1da41cfea00f0fb 100644 (file)
--- a/src/lb_chash.c
+++ b/src/lb_chash.c
@@ -20,7 +20,7 @@
 #include <common/config.h>
 #include <common/debug.h>
 #include <common/standard.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>

diff --git a/src/lb_fas.c b/src/lb_fas.c
index 6b72099f3da2aa7b329f0c197169de72586bd27c..1042e4b83a664ac8c941fa2035f536a8b335c1a5 100644 (file)
--- a/src/lb_fas.c
+++ b/src/lb_fas.c
@@ -19,7 +19,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>

diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c
index bd7793a91427b44ff07420d3ada31a83b8b6ecf5..409e5f821054b7b4a73443c731682e844b4e4720 100644 (file)
--- a/src/lb_fwlc.c
+++ b/src/lb_fwlc.c
@@ -13,7 +13,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>

diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index d419b8ee5c40f2a59bb71424378546dac841561e..fe3d86be1667689a21b7732ba2a59c38d65bed59 100644 (file)
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -13,7 +13,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>

diff --git a/src/lb_map.c b/src/lb_map.c
index b6dcee907a4486b784744ab3d27a67131c6067e0..a5d1ec39c9a40f5089854dc71343e18e4f78b81e 100644 (file)
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -13,7 +13,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <types/global.h>
 #include <types/server.h>

diff --git a/src/mux_h1.c b/src/mux_h1.c
index b1eebf1515549c257b39dda4cbf327db586fc5e4..ac383f5bc4cde72c14c59209f79d09129f67b93e 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -16,7 +16,7 @@
 #include <common/htx.h>
 #include <common/initcall.h>
 
-#include <ebistree.h>
+#include <import/ebistree.h>
 
 #include <types/pipe.h>
 #include <types/proxy.h>

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 297292503f36e904ff9c5940653979cca3ebad69..a77cf840da81afcad71bdd0d641152d566873172 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -27,7 +27,7 @@
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 #include <types/session.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 
 /* dummy streams returned for closed, error, refused, idle and states */

diff --git a/src/pattern.c b/src/pattern.c
index a9425b047c01cfc56b715dd04e12818c21869853..a90820f21f53a946fcdcc676fc1b6b7a7a93e367 100644 (file)
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -25,7 +25,7 @@
 #include <proto/pattern.h>
 #include <proto/sample.h>
 
-#include <ebsttree.h>
+#include <import/ebsttree.h>
 #include <import/lru.h>
 #include <import/xxhash.h>
 

diff --git a/src/proxy.c b/src/proxy.c
index d5dee5d344ff99a99eb371407a756f3e85f78228..0845bced14247464997460a8aaca820b33ad52bd 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -26,8 +26,8 @@
 #include <common/memory.h>
 #include <common/time.h>
 
-#include <eb32tree.h>
-#include <ebistree.h>
+#include <import/eb32tree.h>
+#include <import/ebistree.h>
 
 #include <types/capture.h>
 #include <types/cli.h>

diff --git a/src/queue.c b/src/queue.c
index 9fd3e9d155ceb4e2ccdfb82d1c26b4ff63b902ef..890574d7c6c650ad8c2b53918e4c70c92dbff51f 100644 (file)
--- a/src/queue.c
+++ b/src/queue.c
@@ -74,7 +74,7 @@
 #include <common/memory.h>
 #include <common/time.h>
 #include <common/hathreads.h>
-#include <eb32tree.h>
+#include <import/eb32tree.h>
 
 #include <proto/http_rules.h>
 #include <proto/http_ana.h>

diff --git a/src/server.c b/src/server.c
index e710b4810ce853918abcf1b8090e7340053b5560..15e2f8fec31f73b53c51ca494b35c5bd31f23e83 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -47,7 +47,7 @@
 #include <proto/dns.h>
 #include <netinet/tcp.h>
 
-#include <ebsttree.h>
+#include <import/ebsttree.h>
 
 static void srv_update_status(struct server *s);
 static void srv_update_state(struct server *srv, int version, char **params);

diff --git a/src/shctx.c b/src/shctx.c
index ae9cc1f1bc2ff01ca24a6340f000c6cf2ba83b58..bfca085bb9693e696574076d879d0c8da8ce86e0 100644 (file)
--- a/src/shctx.c
+++ b/src/shctx.c
@@ -13,7 +13,7 @@
 
 #include <sys/mman.h>
 #include <arpa/inet.h>
-#include <ebmbtree.h>
+#include <import/ebmbtree.h>
 #include <types/global.h>
 #include <common/mini-clist.h>
 #include "proto/shctx.h"

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index 0f3f743ea7d12834fefb66a78b566e37a48a597e..4a5f1c1150cb93d2c9e51cfb3dcd6df520ec8f91 100644 (file)
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -25,7 +25,7 @@
 #include <common/errors.h>
 #include <common/standard.h>
 
-#include <ebsttree.h>
+#include <import/ebsttree.h>
 
 #include <types/cli.h>
 #include <types/ssl_ckch.h>

diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 01c107431740aa906db3cc1ffe4b91047bb10e21..38cffc8053dcd59a37ce8e5c3d350b192fcf46ac 100644 (file)
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -19,8 +19,8 @@
 #include <common/standard.h>
 
 #include <dirent.h>
-#include <ebpttree.h>
-#include <ebsttree.h>
+#include <import/ebpttree.h>
+#include <import/ebsttree.h>
 
 #include <types/cli.h>
 #include <types/ssl_crtlist.h>

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 83cb2cb7a0429f4d645d98d8e3bca46d109df081..58ff5833a920b409695d94a738666a105852f89f 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -56,8 +56,8 @@
 #include <common/time.h>
 #include <common/base64.h>
 
-#include <ebpttree.h>
-#include <ebsttree.h>
+#include <import/ebpttree.h>
+#include <import/ebsttree.h>
 
 #include <types/applet.h>
 #include <types/cli.h>

diff --git a/src/standard.c b/src/standard.c
index 701bcc2513749b5773032059bfa11392a41d1ba3..33067bb73a51be7292aea20ad6bd521446f4e62e 100644 (file)
--- a/src/standard.c
+++ b/src/standard.c
@@ -50,8 +50,8 @@
 #include <proto/stream_interface.h>
 #include <proto/task.h>
 
-#include <eb32tree.h>
-#include <eb32sctree.h>
+#include <import/eb32tree.h>
+#include <import/eb32sctree.h>
 
 /* This macro returns false if the test __x is false. Many
  * of the following parsing function must be abort the processing

diff --git a/src/stick_table.c b/src/stick_table.c
index 72b0f8b6b71479ae9f2bc86acc9af65290ddb8fa..862aafc7ed34023098e52dfe5bf8648ede04b3ba 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -23,8 +23,8 @@
 #include <common/standard.h>
 #include <common/time.h>
 
-#include <ebmbtree.h>
-#include <ebsttree.h>
+#include <import/ebmbtree.h>
+#include <import/ebsttree.h>
 
 #include <types/cli.h>
 #include <types/global.h>

diff --git a/src/task.c b/src/task.c
index f58e5f933b4b810c8adffe6e51c4aa67731fe1b4..2d965f291ab85ab1517d00b8e93f7b6d8f5c0748 100644 (file)
--- a/src/task.c
+++ b/src/task.c
@@ -17,8 +17,8 @@
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/time.h>
-#include <eb32sctree.h>
-#include <eb32tree.h>
+#include <import/eb32sctree.h>
+#include <import/eb32tree.h>
 
 #include <proto/fd.h>
 #include <proto/freq_ctr.h>

diff --git a/src/wurfl.c b/src/wurfl.c
index b7eb1fef852cd084ae3a004e9d03d6e02a8b7123..d53e378dc6331684b095a6d08a9c0f255bc06ca9 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -13,8 +13,8 @@
 #include <proto/http_fetch.h>
 #include <proto/http_htx.h>
 #include <proto/sample.h>
-#include <ebsttree.h>
-#include <ebmbtree.h>
+#include <import/ebsttree.h>
+#include <import/ebmbtree.h>
 
 #include <wurfl/wurfl.h>
 

diff --git a/tests/filltab25.c b/tests/filltab25.c
index 3bedf25cf17f62bbf7c4ad3a6ef5003d41ef19e2..956e3b549c177d4996a20407570bf72d36df5057 100644 (file)
--- a/tests/filltab25.c
+++ b/tests/filltab25.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "eb32tree.h"
+#include <import/eb32tree.h>
 
 struct srv {
        struct eb32_node node;