Merge pull request #4330 from danoli3/master

Assimp Patch Android LTS NDK 23 Fix
2022-01-11 10:30:40 +01:00
parent 5dcaf445c3 9d06bd4678
commit 6a640a2de8
1 changed files with 2 additions and 0 deletions
--- a/contrib/unzip/crypt.h
+++ b/contrib/unzip/crypt.h
@@ -17,8 +17,10 @@
 #define _MINICRYPT_H

 #if ZLIB_VERNUM < 0x1270
+#if !defined(Z_U4)
 typedef unsigned long z_crc_t;
 #endif
+#endif

 #ifdef __cplusplus
 extern "C" {