v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_obj_crash

pull/1666/head
Kim Kulling 2017-12-31 12:09:19 +01:00 committed by GitHub
parent ced6e8ce43 3407889ec9
commit da120b03b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/zlib/zlib.h
View File

@ -77,6 +77,9 @@ extern "C" {
the consistency of the compressed data, so the library should never crash the consistency of the compressed data, so the library should never crash
even in the case of corrupted input. even in the case of corrupted input.
*/ */
#ifdef __ANDROID__
using zcrc_t = unsigned_long;
#endif
typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
typedef void (*free_func) OF((voidpf opaque, voidpf address)); typedef void (*free_func) OF((voidpf opaque, voidpf address));