Skip to content

Commit 3656d57

Browse files
pks-tgitster
authored andcommitted
compat: drop uncompress2() compatibility shim
Our compat library has an implementation of zlib's `uncompress2()` function that gets used when linking against an old version of zlib that doesn't yet have it. The last user of `uncompress2()` got removed in 15a60b7 (reftable/block: open-code call to `uncompress2()`, 2024-04-08), so the compatibility code is not required anymore. Drop it. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ee10984 commit 3656d57

File tree

4 files changed

+0
-107
lines changed

4 files changed

+0
-107
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,6 @@ LIB_OBJS += commit.o
984984
LIB_OBJS += compat/nonblock.o
985985
LIB_OBJS += compat/obstack.o
986986
LIB_OBJS += compat/terminal.o
987-
LIB_OBJS += compat/zlib-uncompress2.o
988987
LIB_OBJS += config.o
989988
LIB_OBJS += connect.o
990989
LIB_OBJS += connected.o

compat/zlib-uncompress2.c

Lines changed: 0 additions & 96 deletions
This file was deleted.

git-compat-util.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,15 +1540,6 @@ int common_exit(const char *file, int line, int code);
15401540
#define z_const
15411541
#include <zlib.h>
15421542

1543-
#if ZLIB_VERNUM < 0x1290
1544-
/*
1545-
* This is uncompress2, which is only available in zlib >= 1.2.9
1546-
* (released as of early 2017). See compat/zlib-uncompress2.c.
1547-
*/
1548-
int uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
1549-
uLong *sourceLen);
1550-
#endif
1551-
15521543
/*
15531544
* This include must come after system headers, since it introduces macros that
15541545
* replace system names.

meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ libgit_sources = [
263263
'compat/nonblock.c',
264264
'compat/obstack.c',
265265
'compat/terminal.c',
266-
'compat/zlib-uncompress2.c',
267266
'config.c',
268267
'connect.c',
269268
'connected.c',

0 commit comments

Comments
 (0)