[BUILD] make ebtree headers multiple-include compatible
ebtree did not support being included multiple times.
diff --git a/doc/internals/ebtree b/doc/internals/ebtree
index dd1beda..3b624d4 100644
--- a/doc/internals/ebtree
+++ b/doc/internals/ebtree
@@ -12,3 +12,5 @@
and likely/unlikely which are used in ebtree are also used and defined
in haproxy. Thus, we just conditionally define them.
+Last, all eb*tree*.h have been adapted to support being included multiple
+times, using #ifndef/#define/#endif.
diff --git a/include/common/eb32tree.h b/include/common/eb32tree.h
index 87c2f98..f0c7930 100644
--- a/include/common/eb32tree.h
+++ b/include/common/eb32tree.h
@@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef _COMMON_EB32TREE_H
+#define _COMMON_EB32TREE_H
+
#include "ebtree.h"
@@ -511,3 +514,5 @@
return new;
}
+
+#endif /* _COMMON_EB32TREE_H */
diff --git a/include/common/eb64tree.h b/include/common/eb64tree.h
index 242e2b1..9a069ca 100644
--- a/include/common/eb64tree.h
+++ b/include/common/eb64tree.h
@@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef _COMMON_EB64TREE_H
+#define _COMMON_EB64TREE_H
+
#include "ebtree.h"
@@ -532,3 +535,4 @@
return new;
}
+#endif /* _COMMON_EB64TREE_H */
diff --git a/include/common/ebpttree.h b/include/common/ebpttree.h
index 4908f81..be164ad 100644
--- a/include/common/ebpttree.h
+++ b/include/common/ebpttree.h
@@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef _COMMON_EBPTTREE_H
+#define _COMMON_EBPTTREE_H
+
#include "ebtree.h"
@@ -315,3 +318,4 @@
return new;
}
+#endif /* _COMMON_EBPTTREE_H */
diff --git a/include/common/ebtree.h b/include/common/ebtree.h
index 7a595b9..ebd1e91 100644
--- a/include/common/ebtree.h
+++ b/include/common/ebtree.h
@@ -246,6 +246,8 @@
*/
+#ifndef _COMMON_EBTREE_H
+#define _COMMON_EBTREE_H
#include <stdlib.h>
@@ -716,6 +718,7 @@
void eb_delete(struct eb_node *node);
REGPRM1 struct eb_node *eb_insert_dup(struct eb_node *sub, struct eb_node *new);
+#endif /* _COMMON_EBTREE_H */
/*
* Local variables: