Merge pull request #1663 from assimp/issue_1655

closes https://github.com/assimp/assimp/issues/1655: add typedef for …
2017-12-31 12:08:57 +01:00 · 2017-12-31 12:08:57 +01:00 · 3407889ec9
parent dc5726bd0f 58c38022ab
commit 3407889ec9
1 changed files with 3 additions and 0 deletions
--- a/contrib/zlib/zlib.h
+++ b/contrib/zlib/zlib.h
@ -77,6 +77,9 @@ extern "C" {
  the consistency of the compressed data, so the library should never crash
  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 void   (*free_func)  OF((voidpf opaque, voidpf address));