Merge branch 'master' into gltf2-exporter-improvements

2017-12-14 17:07:30 +01:00
parent d09df8cc07 6a1d2560ac
commit d3876f6e29
1 changed files with 4 additions and 0 deletions
--- a/contrib/unzip/unzip.c
+++ b/contrib/unzip/unzip.c
@@ -41,6 +41,10 @@ woven in by Terry Thorsen 1/2003.
 #include "zlib.h"
 #include "unzip.h"

+#if ZLIB_VERNUM < 0x1270
+typedef unsigned long z_crc_t;
+#endif
+
 #ifdef STDC
 #  include <stddef.h>
 #  include <string.h>