diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-06 14:56:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-06 14:56:45 -0800 |
| commit | 9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0 (patch) | |
| tree | 54481fadf7f95c85d003db2a4b591ce51cb266d5 /reftable | |
| parent | 9fad473faed7862855ced123de81a53fa27187d9 (diff) | |
| parent | 78cdeed4c79d165c915e8de0355cc3fb7f5797c5 (diff) | |
| download | git-9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0.tar.gz | |
Merge branch 'ps/zlib-ng'
The code paths to interact with zlib has been cleaned up in
preparation for building with zlib-ng.
* ps/zlib-ng:
ci: make "linux-musl" job use zlib-ng
ci: switch linux-musl to use Meson
compat/zlib: allow use of zlib-ng as backend
git-zlib: cast away potential constness of `next_in` pointer
compat/zlib: provide stubs for `deflateSetHeader()`
compat/zlib: provide `deflateBound()` shim centrally
git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"
compat: introduce new "zlib.h" header
git-compat-util: drop `z_const` define
compat: drop `uncompress2()` compatibility shim
Diffstat (limited to 'reftable')
| -rw-r--r-- | reftable/block.c | 1 | ||||
| -rw-r--r-- | reftable/system.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/reftable/block.c b/reftable/block.c index 8ac865ce78..b14a8f1259 100644 --- a/reftable/block.c +++ b/reftable/block.c @@ -13,7 +13,6 @@ https://developers.google.com/open-source/licenses/bsd #include "record.h" #include "reftable-error.h" #include "system.h" -#include <zlib.h> size_t header_size(int version) { diff --git a/reftable/system.h b/reftable/system.h index 7d5f803eeb..d02eacea8f 100644 --- a/reftable/system.h +++ b/reftable/system.h @@ -12,6 +12,7 @@ https://developers.google.com/open-source/licenses/bsd /* This header glues the reftable library to the rest of Git */ #include "git-compat-util.h" +#include "compat/zlib-compat.h" /* * An implementation-specific temporary file. By making this specific to the |