diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-18 23:20:22 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-18 23:26:41 +0200 |
| commit | 53fffa12f1207ca2870b3da29e5433fda6d2b0d7 (patch) | |
| tree | 544c297464938a4502951b9678b5988c6de13b75 /thirdparty/minizip/zip.c | |
| parent | 5681b7b60a13737847fe59ab7b43ee0884dc6ac5 (diff) | |
| download | redot-engine-53fffa12f1207ca2870b3da29e5433fda6d2b0d7.tar.gz | |
minizip: Reapply Godot-specific changes for seek support
I have not assessed whether they are still all relevant.
Diffstat (limited to 'thirdparty/minizip/zip.c')
| -rw-r--r-- | thirdparty/minizip/zip.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/thirdparty/minizip/zip.c b/thirdparty/minizip/zip.c index 3c34fc8bd4..d7093e7457 100644 --- a/thirdparty/minizip/zip.c +++ b/thirdparty/minizip/zip.c @@ -854,9 +854,11 @@ extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* gl ziinit.z_filefunc.zseek32_file = NULL; ziinit.z_filefunc.ztell32_file = NULL; - if (pzlib_filefunc64_32_def==NULL) - fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64); - else + /* GODOT start */ + if (pzlib_filefunc64_32_def==NULL) { + //fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64); + } else + /* GODOT end */ ziinit.z_filefunc = *pzlib_filefunc64_32_def; ziinit.filestream = ZOPEN64(ziinit.z_filefunc, @@ -1210,8 +1212,10 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, { if(zi->ci.method == Z_DEFLATED) { - zi->ci.stream.zalloc = (alloc_func)0; - zi->ci.stream.zfree = (free_func)0; + /* GODOT start */ + zi->ci.stream.zalloc = zi->z_filefunc.zfile_func64.alloc_mem; + zi->ci.stream.zfree = zi->z_filefunc.zfile_func64.free_mem; + /* GODOT end */ zi->ci.stream.opaque = (voidpf)0; if (windowBits>0) |