diff --git a/zlib/LICENSE b/zlib/LICENSE index 9f056865b..01a53259d 100644 --- a/zlib/LICENSE +++ b/zlib/LICENSE @@ -1,4 +1,4 @@ -version 1.2.11, January 15th, 2017 +version 1.2.12, January 15th, 2017 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler diff --git a/zlib/deflate.c b/zlib/deflate.c index 3e76e185c..8257dd267 100644 --- a/zlib/deflate.c +++ b/zlib/deflate.c @@ -59,7 +59,7 @@ int x86_check_features() { return 0; } #endif const char deflate_copyright[] = - " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; + " deflate 1.2.12 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot diff --git a/zlib/inftrees.c b/zlib/inftrees.c index 2ea08fc13..9473ab903 100644 --- a/zlib/inftrees.c +++ b/zlib/inftrees.c @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.11 Copyright 1995-2017 Mark Adler "; + " inflate 1.2.12 Copyright 1995-2017 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot diff --git a/zlib/simd.patch b/zlib/simd.patch index 75828d26e..92e3995ed 100644 --- a/zlib/simd.patch +++ b/zlib/simd.patch @@ -553,7 +553,7 @@ index 1ec761448de9..aa0c9c67a6dc 100644 +#include "x86.h" const char deflate_copyright[] = - " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; + " deflate 1.2.12 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; @@ -86,7 +87,7 @@ local block_state deflate_huff OF((deflate_state *s, int flush)); local void lm_init OF((deflate_state *s)); local void putShortMSB OF((deflate_state *s, uInt b)); diff --git a/zlib/zlib.h b/zlib/zlib.h index 68d47a723..8b828da17 100644 --- a/zlib/zlib.h +++ b/zlib/zlib.h @@ -37,7 +37,7 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.11" +#define ZLIB_VERSION "1.2.12" #define ZLIB_VERNUM 0x12b0 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2