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/src/acl.c b/src/acl.c
index fa8ae92..7df433d 100644
--- 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 ed50b29..f68cb14 100644
--- 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 2da564b..7a9e25f 100644
--- 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 14e5980..af6a539 100644
--- 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 77e4793..38ddab0 100644
--- 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 442e973..b908d4d 100644
--- 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 3e6a7ce..e6b82cc 100644
--- 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 6ad5e95..193950d 100644
--- 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 ceedefc..4a1bfc5 100644
--- 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 a7e6b06..558d334 100644
--- 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 12469cc..a4fbe33 100644
--- 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 d60c799..3b90420 100644
--- 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 d7afb58..83cc3cd 100644
--- 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 23448df..91724fd 100644
--- 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 6b72099..1042e4b 100644
--- 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 bd7793a..409e5f8 100644
--- 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 d419b8e..fe3d86b 100644
--- 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 b6dcee9..a5d1ec3 100644
--- 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 b1eebf1..ac383f5 100644
--- 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 2972925..a77cf84 100644
--- 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 a9425b0..a90820f 100644
--- 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 d5dee5d..0845bce 100644
--- 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 9fd3e9d..890574d 100644
--- 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 e710b48..15e2f8f 100644
--- 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 ae9cc1f..bfca085 100644
--- 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 0f3f743..4a5f1c1 100644
--- 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 01c1074..38cffc8 100644
--- 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 83cb2cb..58ff583 100644
--- 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 701bcc2..33067bb 100644
--- 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 72b0f8b..862aafc 100644
--- 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 f58e5f9..2d965f2 100644
--- 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 b7eb1fe..d53e378 100644
--- 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>