mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

[BUILD] make ebtree headers multiple-include compatible

Browse Source 
ebtree did not support being included multiple times.
This commit is contained in:
Willy Tarreau 2007-11-19 18:43:04 +01:00
parent e6d2e4dbdf
commit f56fd8a285
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/internals/ebtree
View File

@ -12,3 +12,5 @@ Also, some optimizations are not redefined if already known: REGPRM*
and likely/unlikely which are used in ebtree are also used and defined and likely/unlikely which are used in ebtree are also used and defined
in haproxy. Thus, we just conditionally define them. 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.

5
include/common/eb32tree.h
View File

@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _COMMON_EB32TREE_H
#define _COMMON_EB32TREE_H
#include "ebtree.h" #include "ebtree.h"
@ -511,3 +514,5 @@ __eb32i_insert(struct eb_root *root, struct eb32_node *new) {
return new; return new;
} }
#endif /* _COMMON_EB32TREE_H */

4
include/common/eb64tree.h
View File

@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _COMMON_EB64TREE_H
#define _COMMON_EB64TREE_H
#include "ebtree.h" #include "ebtree.h"
@ -532,3 +535,4 @@ __eb64i_insert(struct eb_root *root, struct eb64_node *new) {
return new; return new;
} }
#endif /* _COMMON_EB64TREE_H */

4
include/common/ebpttree.h
View File

@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _COMMON_EBPTTREE_H
#define _COMMON_EBPTTREE_H
#include "ebtree.h" #include "ebtree.h"
@ -315,3 +318,4 @@ __ebpt_insert(struct eb_root *root, struct ebpt_node *new) {
return new; return new;
} }
#endif /* _COMMON_EBPTTREE_H */

3
include/common/ebtree.h
View File

@ -246,6 +246,8 @@
*/ */
#ifndef _COMMON_EBTREE_H
#define _COMMON_EBTREE_H
#include <stdlib.h> #include <stdlib.h>
@ -716,6 +718,7 @@ static inline void __eb_delete(struct eb_node *node)
void eb_delete(struct eb_node *node); void eb_delete(struct eb_node *node);
REGPRM1 struct eb_node *eb_insert_dup(struct eb_node *sub, struct eb_node *new); REGPRM1 struct eb_node *eb_insert_dup(struct eb_node *sub, struct eb_node *new);
#endif /* _COMMON_EBTREE_H */
/* /*
* Local variables: * Local variables: