From 9be98893aaf69892811d617122e28ea2dd8e17ba Mon Sep 17 00:00:00 2001 From: Ilya Leoshkevich Date: Tue, 12 Apr 2022 15:16:20 +0200 Subject: Use PREFIX() for some of the Z_INTERNAL symbols https://github.com/powturbo/TurboBench links zlib and zlib-ng into the same binary, causing non-static symbol conflicts. Fix by using PREFIX() for flush_pending(), bi_reverse(), inflate_ensure_window() and all of the IBM Z symbols. Note: do not use an explicit zng_, since one of the long-term goals is to be able to link two versions of zlib-ng into the same binary for benchmarking [1]. [1] https://github.com/zlib-ng/zlib-ng/pull/1248#issuecomment-1096648932 --- tools/maketrees.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/maketrees.c b/tools/maketrees.c index 282bddc2e5..97688c7aae 100644 --- a/tools/maketrees.c +++ b/tools/maketrees.c @@ -90,7 +90,7 @@ static void tr_static_init(void) { /* The static distance tree is trivial: */ for (n = 0; n < D_CODES; n++) { static_dtree[n].Len = 5; - static_dtree[n].Code = bi_reverse((unsigned)n, 5); + static_dtree[n].Code = PREFIX(bi_reverse)((unsigned)n, 5); } } -- cgit 0.0.5-2-1-g0f52