From 0cb98b2451a6005c47ff1b49737ffbd9bb0cf179 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 20 Nov 2017 21:11:12 +0100 Subject: [PATCH] BUILD: ebtree: don't redefine types u32/s32 in scope-aware trees Clang emits a warning about these types being redefined in eb32sctree while they are already defined in eb32tree. Let's simply not redefine them if eb32tree was already included. --- ebtree/eb32sctree.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ebtree/eb32sctree.h b/ebtree/eb32sctree.h index be469baa6..9d0c99765 100644 --- a/ebtree/eb32sctree.h +++ b/ebtree/eb32sctree.h @@ -28,8 +28,10 @@ #define eb32sc_entry(ptr, type, member) container_of(ptr, type, member) /* These types may sometimes already be defined */ +#ifndef _EB32TREE_H typedef unsigned int u32; typedef signed int s32; +#endif /* This structure carries a node, a leaf, a scope, and a key. It must start * with the eb_node so that it can be cast into an eb_node. We could also