diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2021-01-03 15:39:12 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2021-01-03 15:42:00 +0000 |
| commit | bcae12b591d9b5f3073c71f7e090dc8611360eb6 (patch) | |
| tree | 4638b02b2f5f4f905f5797348f2d721afcc588be /sys/contrib | |
| parent | 86d2671e3e0541b0efc680c5f1ea0d19a7b742eb (diff) | |
| download | src-bcae12b591d9b5f3073c71f7e090dc8611360eb6.tar.gz src-bcae12b591d9b5f3073c71f7e090dc8611360eb6.zip | |
zstd: Fix non-FreeBSD CI libzstd build
Fix non-FreeBSD CI build after v1.4.8. This definition was only used in
zstd(1), which isn't part of non-FreeBSD CI (I guess). The ifdef was
added in v1.4.5 import.
Upstream does not currently support shared-linked zstd(1), but I have
proposed https://github.com/facebook/zstd/pull/2450 . If that is
adopted, we can add -DZSTD_PROGRAMS_LINK_SHARED to our libzstd build and
drop some diffs.
Reported by: uqs
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/zstd/lib/compress/zstd_compress_internal.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/contrib/zstd/lib/compress/zstd_compress_internal.h b/sys/contrib/zstd/lib/compress/zstd_compress_internal.h index 174bc92ce623..4749da101be2 100644 --- a/sys/contrib/zstd/lib/compress/zstd_compress_internal.h +++ b/sys/contrib/zstd/lib/compress/zstd_compress_internal.h @@ -1198,8 +1198,9 @@ size_t ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSe /** ZSTD_cycleLog() : * condition for correct operation : hashLog > 1 */ -#ifdef __FreeBSD__ /* This symbol is needed by dll-linked CLI zstd(1). */ -ZSTDLIB_API U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat); -#endif +/* Begin FreeBSD - This symbol is needed by dll-linked CLI zstd(1). */ +ZSTDLIB_API +/* End FreeBSD */ +U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat); #endif /* ZSTD_COMPRESS_H */ |