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.

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

include/common/namespace.h

@@ -2,7 +2,7 @@
 #define _NAMESPACE_H
 
 #include <stdlib.h>
-#include <ebistree.h>
+#include <import/ebistree.h>
 
 #ifdef USE_NS
 

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

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

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)
 {

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

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>

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

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>

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;

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>

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>

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>

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

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

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

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 {

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;

include/types/pattern.h

@@ -29,7 +29,7 @@
 
 #include <types/sample.h>
 
-#include <ebmbtree.h>
+#include <import/ebmbtree.h>
 
 /* Pattern matching function result.
  *

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>
 

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;

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>

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>

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>
 

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>

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>

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

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 = {

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>

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)
 {

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

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)
 {

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)
 {

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.

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

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.

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)
 {

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

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)
 {

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>

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>

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>

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>

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>

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>

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>

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

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>
 

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>

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>

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);

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"

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>

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>

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>

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

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>

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>

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>
 

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;