Z_PREFIX zError function

This commit is contained in:
zxzxzzz 2021-12-14 17:03:12 +08:00
parent 9aa0812b9f
commit 91f2facb25
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From e00412f6b595c517ddc9ab44e810454e156dfb77 Mon Sep 17 00:00:00 2001
From: koala <869829183@qq.com>
Date: Fri, 11 Jun 2021 19:29:27 +0800
Subject: [PATCH 0757/1000] Z_PREFIX zError function
When a project use zError function,linker can not find z_zError function
---
zlibWrapper/zstd_zlibwrapper.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/zlibWrapper/zstd_zlibwrapper.c b/zlibWrapper/zstd_zlibwrapper.c
index ceb23937..adb231f0 100644
--- a/zlibWrapper/zstd_zlibwrapper.c
+++ b/zlibWrapper/zstd_zlibwrapper.c
@@ -1189,3 +1189,10 @@ ZEXTERN const z_crc_t FAR * ZEXPORT z_get_crc_table OF((void))
return get_crc_table();
}
#endif
+
+ /* Error function */
+ZEXTERN const char * ZEXPORT z_zError OF((int err))
+{
+ /* Just use zlib Error function */
+ return zError(err);
+}
--
2.23.0

View File

@ -2,7 +2,7 @@
Name: zstd
Version: 1.5.0
Release: 14
Release: 15
Summary: A fast lossless compression algorithm
License: BSD and GPLv2
URL: https://github.com/facebook/zstd
@ -19,6 +19,7 @@ Patch8: patch-8-fix-extra-newline-gets-printes-out-when-compressing-mul
Patch9: patch-9-add-test-c-result-print.patch
Patch10: backport-zstd-1.5.0-patch-10-fix-entropy-repeat-mode-bug.patch
Patch11: backport-zstd-1.5.0-patch-11-Fix-progress-flag-to-properly-control-progress-display-and-default.patch
Patch12: backport-zstd-1.5.0-patch-12-Z_PREFIX-zError-function.patch
BuildRequires: gtest-devel gcc-c++ pkg-config
@ -97,6 +98,9 @@ install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1
%{_mandir}/man1/*.1*
%changelog
* Tue Dec 14 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.15
* Z_PREFIX zError function
* Tue Dec 14 2021 zhangxiao <zhangxiao131@huawei.com> - 1.5.0.14
* Fix progress flag to properly control progress display and default