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/include/types/acl.h b/include/types/acl.h
index 04318ea..f5d3858 100644
--- 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 27ce72d..a23091c 100644
--- 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 006e915..30953f6 100644
--- 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 9926de0..06afda8 100644
--- 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 f9e399f..d7beb26 100644
--- 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 42b3c39..301034c 100644
--- 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 5991ce9..9486064 100644
--- 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 4590a96..e20d70a 100644
--- 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 170eb24..f20659a 100644
--- 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 731f055..754d0c6 100644
--- 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 b815cc3..d035a90 100644
--- 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 9ed6b4b..f4c0a13 100644
--- 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 89962a3..78270bf 100644
--- 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 39f99ca..10437a7 100644
--- 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 c136ecb..a9adce0 100644
--- 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 7b1ae5f..376fc03 100644
--- 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 095a127..2879d74 100644
--- 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 78639ac..aed6e6c 100644
--- 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 5e15aaa..832ecd2 100644
--- 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 6ca9767..0fba898 100644
--- 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 */