summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2019-05-13 20:42:52 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2019-05-13 20:42:52 (GMT)
commit0a5a9f2b05cda529a6e4227244777b61376b4bab (patch)
tree41e00653cbd83a7d3d399977e4097a48bdfc15d0
parent51cd8ee68a63edc414c0fe3344ba0589ac5849dd (diff)
parent7ab7fc58df530bd81f773e2fd134923b82a13b4e (diff)
downloadblt-0a5a9f2b05cda529a6e4227244777b61376b4bab.zip
blt-0a5a9f2b05cda529a6e4227244777b61376b4bab.tar.gz
blt-0a5a9f2b05cda529a6e4227244777b61376b4bab.tar.bz2
Merge branch 'master' into devel
-rw-r--r--tclzipfs/tclZipfs.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/tclzipfs/tclZipfs.c b/tclzipfs/tclZipfs.c
index 8b23a7d..ae057e6 100644
--- a/tclzipfs/tclZipfs.c
+++ b/tclzipfs/tclZipfs.c
@@ -35,6 +35,13 @@
#ifdef HAVE_ZLIB
#include "zlib.h"
+
+#ifdef Z_U4
+ typedef Z_U4 z_crc_t;
+#else
+ typedef unsigned long z_crc_t;
+#endif
+
#include "crypt.h"
#ifdef CFG_RUNTIME_DLLFILE
@@ -296,12 +303,12 @@ static const char pwrot[16] = {
/*
* Table to compute CRC32.
- */
#ifdef Z_U4
typedef Z_U4 z_crc_t;
#else
typedef unsigned long z_crc_t;
#endif
+ */
static const z_crc_t crc32tab[256] = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,