Merge branch 'master' into fix_obj_crash

2017-12-31 12:09:19 +01:00 · 2017-12-31 12:09:19 +01:00 · da120b03b4
parent ced6e8ce43 3407889ec9
commit da120b03b4
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));