1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2022-11-24 07:35:17 +01:00
parent fd766ddfaf
commit a4728584ff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stick_table.c
View File

@ -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 */