diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | test/example.c | 4 | ||||
| -rw-r--r-- | zlib-ng.h | 11 | ||||
| -rw-r--r-- | zlib.h | 11 | ||||
| -rw-r--r-- | zutil.c | 2 |
5 files changed, 16 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index 0dd656d644..28d637470e 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 97ca0029b9..8a8905dd5b 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); @@ -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 @@ -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 @@ -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) { |