Thread (13 messages) flat view 13 messages, 1 author, 2021-08-16
STALE1820d

[PATCH v2 5/7] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c

From: Carlo Marcelo Arenas Belón <hidden>
Date: 2021-08-16 01:16:04
Subsystem: the rest · Maintainer: Linus Torvalds

the code imported from zlib 1.2.11 uses an optional feature from 1.2.5.2
that could cause compilation errors with older versions.

make sure it is defined and disabled in those cases to avoid
building failures.

Signed-off-by: Carlo Marcelo Arenas Belón <redacted>
---
 compat/zlib-uncompress2.c | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/compat/zlib-uncompress2.c b/compat/zlib-uncompress2.c
index 23b72b49c4..f49f680567 100644
--- a/compat/zlib-uncompress2.c
+++ b/compat/zlib-uncompress2.c
@@ -14,6 +14,9 @@
  */
 
 #include <zlib.h>
+#ifndef z_const
+#define z_const
+#endif
 
 /* clang-format off */
 
-- 
2.33.0.rc2.476.g1b09a32a73
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help