From: Willy Tarreau <w@1wt.eu>
Date: Thu, 24 Nov 2022 06:35:17 +0000 (+0100)
Subject: BUILD: stick-tables: fix build breakage in xxhash on older compilers
X-Git-Tag: v2.7-dev10~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4728584ffc19bff3893a00061591f53bb60f5c5;p=thirdparty%2Fhaproxy.git

BUILD: stick-tables: fix build breakage in xxhash on older compilers

Commit 36d156564 ("MINOR: peers: Support for peer shards") reintroduced
a direct dependency on import/xxhash.h which was previously dropped by
commit d5fc8fcb8 ("CLEANUP: Add haproxy/xxhash.h to avoid modifying
import/xxhash.h"). This results in xxhash.h being included twice, which
breaks the build on older compilers which do not like seeing XXH32_hash_t
being defined twice.

Let's just use include/haproxy/xxhash.h instead.

No backport is needed.
---

diff --git a/src/stick_table.c b/src/stick_table.c
index 958618c9f8..85c4a1bb6d 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -17,7 +17,6 @@
 #include <import/ebmbtree.h>
 #include <import/ebsttree.h>
 #include <import/ebistree.h>
-#include <import/xxhash.h>
 
 #include <haproxy/api.h>
 #include <haproxy/applet.h>
@@ -45,6 +44,7 @@
 #include <haproxy/tcp_rules.h>
 #include <haproxy/ticks.h>
 #include <haproxy/tools.h>
+#include <haproxy/xxhash.h>
 
 
 /* structure used to return a table key built from a sample */