git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Carlo Marcelo Arenas Belón <carenas@gmail.com>
Date
Aug 16, 2021, 01:15 UTC
Message-ID
<20210816011538.34199-6-carenas@gmail.com>
In-Reply-To
<20210816011538.34199-1-carenas@gmail.com>

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 <carenas@gmail.com>
---
 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
Previous: Carlo Marcelo Arenas BelónNext: Carlo Marcelo Arenas Belón
Message 12 of 14 in “hn/reftable "fixes" for OpenBSD”
  1. 0/3 hn/reftable "fixes" for OpenBSDCarlo Marcelo Arenas Belón, Aug 2, 2021
  2. 1/3 fixup! Provide zlib's uncompress2 from compat/zlib-compat.cCarlo Marcelo Arenas Belón, Aug 2, 2021
  3. 2/3 reftable: clarify zlib version dependencyCarlo Marcelo Arenas Belón, Aug 2, 2021
  4. 3/3 openbsd: allow reftable building with zlib 1.2.3Carlo Marcelo Arenas Belón, Aug 2, 2021
  5. 4/3 fixup! reftable: add dump utilityCarlo Marcelo Arenas Belón, Aug 4, 2021
  6. Junio C HamanoAug 4, 2021
  7. 0/7 hn/reftable "fixes" for BSDCarlo Marcelo Arenas Belón, Aug 16, 2021
  8. 1/7 fixup! Provide zlib's uncompress2 from compat/zlib-compat.cCarlo Marcelo Arenas Belón, Aug 16, 2021
  9. 2/7 reftable: clarify zlib version dependencyCarlo Marcelo Arenas Belón, Aug 16, 2021
  10. 3/7 openbsd: allow reftable building with zlib 1.2.3Carlo Marcelo Arenas Belón, Aug 16, 2021
  11. 4/7 fixup! reftable: add dump utilityCarlo Marcelo Arenas Belón, Aug 16, 2021
  12. 5/7 fixup! Provide zlib's uncompress2 from compat/zlib-compat.cCarlo Marcelo Arenas Belón, Aug 16, 2021
  13. 6/7 fixup! reftable: reftable file level testsCarlo Marcelo Arenas Belón, Aug 16, 2021
  14. 7/7 fixup! reftable: (de)serialization for the polymorphic record typeCarlo Marcelo Arenas Belón, Aug 16, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.