From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Thu, 20 May 2021 18:51:51 +0000 (+0200)
Subject: Open up develop branch for non-stable commits.
X-Git-Tag: 2.1.0-beta1~598
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74436cfb05b0d6bd1acff4e8e57204cb176d738e;p=thirdparty%2Fzlib-ng.git

Open up develop branch for non-stable commits.
Replace ZLIBNG_VERNUM with a larger one with space for more accurate information.
Replace ZLIBNG_VER_SUBREVISION with ZLIBNG_VER_MODIFIED and ZLIBNG_VER_STATUS.
---

diff --git a/Makefile.in b/Makefile.in
index 0dd656d6..28d63747 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,7 +29,7 @@ TEST_LIBS=$(LIBNAME1).a
 LDSHARED=$(CC)
 LDSHAREDFLAGS=-shared
 
-VER=2.0.4
+VER=2.1.0.devel
 VER1=2
 
 STATICLIB=$(LIBNAME1).a
diff --git a/test/example.c b/test/example.c
index 97ca0029..8a8905dd 100644
--- a/test/example.c
+++ b/test/example.c
@@ -1016,8 +1016,8 @@ int main(int argc, char *argv[]) {
         fprintf(stderr, "warning: different zlib version\n");
     }
 
-    printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",
-            PREFIX2(VERSION), PREFIX2(VERNUM), PREFIX(zlibCompileFlags)());
+    printf("zlib-ng version %s = 0x%08lx, compile flags = 0x%lx\n",
+            ZLIBNG_VERSION, ZLIBNG_VERNUM, PREFIX(zlibCompileFlags)());
 
     compr    = (unsigned char*)calloc((unsigned int)comprLen, 1);
     uncompr  = (unsigned char*)calloc((unsigned int)uncomprLen, 1);
diff --git a/zlib-ng.h b/zlib-ng.h
index 2a078385..36750cf1 100644
--- a/zlib-ng.h
+++ b/zlib-ng.h
@@ -44,12 +44,13 @@
 extern "C" {
 #endif
 
-#define ZLIBNG_VERSION "2.0.4"
-#define ZLIBNG_VERNUM 0x2040
+#define ZLIBNG_VERSION "2.1.0.devel"
+#define ZLIBNG_VERNUM 0x02010000L   /* MMNNRRMS: major minor revision status modified */
 #define ZLIBNG_VER_MAJOR 2
-#define ZLIBNG_VER_MINOR 0
-#define ZLIBNG_VER_REVISION 4
-#define ZLIBNG_VER_SUBREVISION 0
+#define ZLIBNG_VER_MINOR 1
+#define ZLIBNG_VER_REVISION 0
+#define ZLIBNG_VER_STATUS 0         /* 0=devel, 1-E=beta, F=Release */
+#define ZLIBNG_VER_MODIFIED 0       /* non-zero if modified externally from zlib-ng */
 
 /*
     The 'zlib' compression library provides in-memory compression and
diff --git a/zlib.h b/zlib.h
index 0b443423..6852dc67 100644
--- a/zlib.h
+++ b/zlib.h
@@ -46,12 +46,13 @@
 extern "C" {
 #endif
 
-#define ZLIBNG_VERSION "2.0.4"
-#define ZLIBNG_VERNUM 0x2040
+#define ZLIBNG_VERSION "2.1.0.devel"
+#define ZLIBNG_VERNUM 0x02010000L   /* MMNNRRMS: major minor revision status modified */
 #define ZLIBNG_VER_MAJOR 2
-#define ZLIBNG_VER_MINOR 0
-#define ZLIBNG_VER_REVISION 4
-#define ZLIBNG_VER_SUBREVISION 0
+#define ZLIBNG_VER_MINOR 1
+#define ZLIBNG_VER_REVISION 0
+#define ZLIBNG_VER_STATUS 0         /* 0=devel, 1-E=beta, F=Release */
+#define ZLIBNG_VER_MODIFIED 0       /* non-zero if modified externally from zlib-ng */
 
 #define ZLIB_VERSION "1.2.11.zlib-ng"
 #define ZLIB_VERNUM 0x12bf
diff --git a/zutil.c b/zutil.c
index b38dc45a..74d75243 100644
--- a/zutil.c
+++ b/zutil.c
@@ -21,7 +21,7 @@ z_const char * const PREFIX(z_errmsg)[10] = {
 };
 
 const char zlibng_string[] =
-    " zlib-ng 2.0.4 forked from zlib";
+    " zlib-ng 2.1.0.devel forked from zlib";
 
 #ifdef ZLIB_COMPAT
 const char * Z_EXPORT zlibVersion(void) {