From 2ce4e124e7438b28fd41ed7c9fa32416886037c3 Mon Sep 17 00:00:00 2001
From: Zlib-ng Upstream <kwrobot@kitware.com>
Date: Wed, 10 Jan 2024 23:25:47 +0100
Subject: [PATCH] zlib-ng 2024-01-10 (74253725)

Code extracted from:

    https://github.com/zlib-ng/zlib-ng.git

at commit 74253725f884e2424a0dd8ae3f69896d5377f325 (develop).
---
 zconf.h.in | 3 +++
 zlib.h.in  | 6 +++---
 zutil.c    | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/zconf.h.in b/zconf.h.in
index 074f0255161..7a6e281e849 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -116,6 +116,9 @@
 #ifndef ZEXPORTVA
 #  define ZEXPORTVA Z_EXPORTVA
 #endif
+#ifndef FAR
+#  define FAR
+#endif
 
 /* Legacy zlib typedefs for backwards compatibility. Don't assume stdint.h is defined. */
 typedef unsigned char Byte;
diff --git a/zlib.h.in b/zlib.h.in
index 9e27d99c07e..eabb94afe09 100644
--- a/zlib.h.in
+++ b/zlib.h.in
@@ -49,11 +49,11 @@
 extern "C" {
 #endif
 
-#define ZLIBNG_VERSION "2.1.5"
-#define ZLIBNG_VERNUM 0x020105F0L   /* MMNNRRSM: major minor revision status modified */
+#define ZLIBNG_VERSION "2.1.6"
+#define ZLIBNG_VERNUM 0x020106F0L   /* MMNNRRSM: major minor revision status modified */
 #define ZLIBNG_VER_MAJOR 2
 #define ZLIBNG_VER_MINOR 1
-#define ZLIBNG_VER_REVISION 5
+#define ZLIBNG_VER_REVISION 6
 #define ZLIBNG_VER_STATUS F         /* 0=devel, 1-E=beta, F=Release (DEPRECATED) */
 #define ZLIBNG_VER_STATUSH 0xF      /* Hex values: 0=devel, 1-E=beta, F=Release */
 #define ZLIBNG_VER_MODIFIED 0       /* non-zero if modified externally from zlib-ng */
diff --git a/zutil.c b/zutil.c
index bd937c55e82..270a28c7420 100644
--- a/zutil.c
+++ b/zutil.c
@@ -21,7 +21,7 @@ z_const char * const PREFIX(z_errmsg)[10] = {
 };
 
 const char PREFIX3(vstring)[] =
-    " zlib-ng 2.1.5";
+    " zlib-ng 2.1.6";
 
 #ifdef ZLIB_COMPAT
 const char * Z_EXPORT zlibVersion(void) {