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 --- cpu_features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpu_features.c') diff --git a/cpu_features.c b/cpu_features.c index 6ef5aa2c4b..b5e7257696 100644 --- a/cpu_features.c +++ b/cpu_features.c @@ -18,7 +18,7 @@ Z_INTERNAL void cpu_check_features(void) { #elif defined(PPC_FEATURES) || defined(POWER_FEATURES) power_check_features(); #elif defined(S390_FEATURES) - s390_check_features(); + PREFIX(s390_check_features)(); #endif features_checked = 1; } -- cgit 0.0.5-2-1-g0f52