]> git.ipfire.org Git - thirdparty/haproxy.git/commit
BUILD: stick-tables: fix build breakage in xxhash on older compilers
authorWilly Tarreau <w@1wt.eu>
Thu, 24 Nov 2022 06:35:17 +0000 (07:35 +0100)
committerWilly Tarreau <w@1wt.eu>
Thu, 24 Nov 2022 06:38:13 +0000 (07:38 +0100)
commita4728584ffc19bff3893a00061591f53bb60f5c5
tree336938fe9278151ccdc628f55617dd009de4ad47
parentfd766ddfaf5b08402c4b32e607c1aa1572b063fe
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.
src/stick_table.c