diff options
| author | Rich Ercolani <rincebrain@gmail.com> | 2022-03-01 08:34:29 -0500 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2022-03-01 13:55:51 -0800 |
| commit | e2206359955de08a43373eff761af278bfd96d3f (patch) | |
| tree | c69b1f372d11039c4b371b69b8fe70936515c562 | |
| parent | 234e9605c1f2cdf64f13df0697aa5017f416656a (diff) | |
Re-apply a78f19d3
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12978
| -rw-r--r-- | module/zstd/include/zstd_compat_wrapper.h | 1 | ||||
| -rw-r--r-- | module/zstd/lib/common/zstd_common.c | 2 | ||||
| -rw-r--r-- | module/zstd/lib/common/zstd_internal.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/module/zstd/include/zstd_compat_wrapper.h b/module/zstd/include/zstd_compat_wrapper.h index ad8879ed8..c39dfa2db 100644 --- a/module/zstd/include/zstd_compat_wrapper.h +++ b/module/zstd/include/zstd_compat_wrapper.h @@ -420,6 +420,7 @@ zfs_ZSTD_insertAndFindFirstIndex_internal #define ZSTD_insertBlock zfs_ZSTD_insertBlock #define ZSTD_invalidateRepCodes zfs_ZSTD_invalidateRepCodes +#define ZSTD_isError zfs_ZSTD_isError #define ZSTD_isFrame zfs_ZSTD_isFrame #define ZSTD_ldm_adjustParameters zfs_ZSTD_ldm_adjustParameters #define ZSTD_ldm_blockCompress zfs_ZSTD_ldm_blockCompress diff --git a/module/zstd/lib/common/zstd_common.c b/module/zstd/lib/common/zstd_common.c index 91fe3323a..935670b1d 100644 --- a/module/zstd/lib/common/zstd_common.c +++ b/module/zstd/lib/common/zstd_common.c @@ -30,7 +30,7 @@ const char* ZSTD_versionString(void) { return ZSTD_VERSION_STRING; } /*-**************************************** * ZSTD Error Management ******************************************/ -#undef ZSTD_isError /* defined within zstd_internal.h */ + /*! ZSTD_isError() : * tells if a return value is an error code * symbol is required for external callers */ diff --git a/module/zstd/lib/common/zstd_internal.h b/module/zstd/lib/common/zstd_internal.h index 3bc7e55a0..20899575b 100644 --- a/module/zstd/lib/common/zstd_internal.h +++ b/module/zstd/lib/common/zstd_internal.h @@ -43,7 +43,6 @@ extern "C" { /* ---- static assert (debug) --- */ #define ZSTD_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c) -#define ZSTD_isError ERR_isError /* for inlining */ #define FSE_isError ERR_isError #define HUF_isError ERR_isError |