From 5681b7b60a13737847fe59ab7b43ee0884dc6ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 18 Aug 2017 23:17:50 +0200 Subject: minizip: Sync with pristine contrib/minizip from zlib 1.2.4 Godot-specific changes are undone in this commit, they will be readded and properly documented in the following commit. --- thirdparty/minizip/ioapi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'thirdparty/minizip/ioapi.c') diff --git a/thirdparty/minizip/ioapi.c b/thirdparty/minizip/ioapi.c index d6063a5fe6..49958f61ff 100644 --- a/thirdparty/minizip/ioapi.c +++ b/thirdparty/minizip/ioapi.c @@ -6,7 +6,7 @@ Modifications for Zip64 support Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) - For more info read LICENSE-MiniZip.txt + For more info read MiniZip_info.txt */ @@ -68,11 +68,8 @@ void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filef p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque; p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file; p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file; - p_filefunc64_32->zfile_func64.alloc_mem = p_filefunc32->alloc_mem; - p_filefunc64_32->zfile_func64.free_mem = p_filefunc32->free_mem; } -/* static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode)); @@ -119,6 +116,7 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, return file; } + static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size) { uLong ret; @@ -140,6 +138,7 @@ static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) return ret; } + static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream) { ZPOS64_T ret; @@ -234,4 +233,3 @@ void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def) pzlib_filefunc_def->zerror_file = ferror_file_func; pzlib_filefunc_def->opaque = NULL; } -*/ -- cgit v1.2.3