From: dan <dan@noemail.net>
Date: Tue, 16 Jan 2018 17:33:09 +0000 (+0000)
Subject: Change a cat in zipfile.c from (z_const Bytef*) to just (Bytef*). This allows the... 
X-Git-Tag: version-3.22.0~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=194a17bbb7b58562792c3ed762f4eee6c683064f;p=thirdparty%2Fsqlite.git

Change a cat in zipfile.c from (z_const Bytef*) to just (Bytef*). This allows the module to build with older versions of zlib.

FossilOrigin-Name: ac9af91d5a2927e71903461e7bbdd2c0168fde9a042853c8bcd4c7ebd0d51e0d
---

diff --git a/ext/misc/zipfile.c b/ext/misc/zipfile.c
index f17b3735fb..5100bc4f79 100644
--- a/ext/misc/zipfile.c
+++ b/ext/misc/zipfile.c
@@ -771,7 +771,7 @@ static int zipfileDeflate(
     int res;
     z_stream str;
     memset(&str, 0, sizeof(str));
-    str.next_in = (z_const Bytef*)aIn;
+    str.next_in = (Bytef*)aIn;
     str.avail_in = nIn;
     str.next_out = aOut;
     str.avail_out = nAlloc;
diff --git a/manifest b/manifest
index 31ecdf30e1..255197fd5b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\san\sinfinite\sloop\sor\sother\smalfunction\sin\ssome\sUPDATE\nstatements\swith\san\sOR\sterm\sin\sthe\sWHERE\sclause.
-D 2018-01-16T13:37:43.188
+C Change\sa\scat\sin\szipfile.c\sfrom\s(z_const\sBytef*)\sto\sjust\s(Bytef*).\sThis\sallows\sthe\smodule\sto\sbuild\swith\solder\sversions\sof\szlib.
+D 2018-01-16T17:33:09.985
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2
@@ -303,7 +303,7 @@ F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
 F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9
 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
 F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
-F ext/misc/zipfile.c 7e48d2947a1fe71d22e54f3b499d6d0581efa105033683585d3dbde76cffaed7
+F ext/misc/zipfile.c cc12e900e12eec2358c0dc2cb341bf192217aab0932873958c62a4ae7cbf9988
 F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e
 F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842
 F ext/rbu/rbu10.test 1846519a438697f45e9dcb246908af81b551c29e1078d0304fae83f1fed7e9ee
@@ -1699,7 +1699,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ce8bfe6c2b87090a2de1e04bc88fcb878597fe1f4ecd5df6d9d588a65601c901
-R 1aa7995509c0f191863de5587ae93f47
+P feb2c2b6f66b0f45490beb1642d99cdb89fa220e299a8c118929df557c814189
+R 9fb18308fe7bf47a56b5953076efa014
 U dan
-Z 2e5fd108f2c4172f1f8c00e9ff432235
+Z cc16d38e7e88ca94b914298c53e9f0f1
diff --git a/manifest.uuid b/manifest.uuid
index 239a9bce67..653213b754 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-feb2c2b6f66b0f45490beb1642d99cdb89fa220e299a8c118929df557c814189
\ No newline at end of file
+ac9af91d5a2927e71903461e7bbdd2c0168fde9a042853c8bcd4c7ebd0d51e0d
\ No newline at end of file