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 /git-compat-util.h | |
| parent | Merge branch 'js/bundle-unbundle-fd-reuse-fix' (diff) | |
| parent | ci: make "linux-musl" job use zlib-ng (diff) | |
| download | git-9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0.tar.gz git-9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0.zip | |
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 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index d43dd248c4..e123288e8f 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1539,18 +1539,6 @@ int cmd_main(int, const char **); int common_exit(const char *file, int line, int code); #define exit(code) exit(common_exit(__FILE__, __LINE__, (code))) -#define z_const -#include <zlib.h> - -#if ZLIB_VERNUM < 0x1290 -/* - * This is uncompress2, which is only available in zlib >= 1.2.9 - * (released as of early 2017). See compat/zlib-uncompress2.c. - */ -int uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source, - uLong *sourceLen); -#endif - /* * This include must come after system headers, since it introduces macros that * replace system names. |