From: Willy Tarreau <w@1wt.eu>
Date: Mon, 20 Nov 2017 20:11:12 +0000 (+0100)
Subject: BUILD: ebtree: don't redefine types u32/s32 in scope-aware trees
X-Git-Tag: v1.8.0~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb98b2451a6005c47ff1b49737ffbd9bb0cf179;p=thirdparty%2Fhaproxy.git

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

diff --git a/ebtree/eb32sctree.h b/ebtree/eb32sctree.h
index be469baa66..9d0c997656 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