Browse Source

Merge pull request #4330 from danoli3/master

Assimp Patch Android LTS NDK 23 Fix
Kim Kulling 3 years ago
parent
commit
6a640a2de8
1 changed files with 2 additions and 0 deletions
  1. 2 0
      contrib/unzip/crypt.h

+ 2 - 0
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" {