summaryrefslogtreecommitdiff
path: root/crc32.h
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-04-29 16:18:12 -0700
committerMark Adler <madler@alumni.caltech.edu>2012-04-29 16:18:12 -0700
commit6c9bd474aa08312ef2e2e9655a80e18db24a1680 (patch)
tree2539e04a1037206dc3853fbdbb33194bb2690aaa /crc32.h
parent1be117908397b0ce065c07c60fa2b4ae778ff112 (diff)
downloadzlib-6c9bd474aa08312ef2e2e9655a80e18db24a1680.tar.gz
Fix type mismatch between get_crc_table() and crc_table.
crc_table is made using a four-byte integer (when that can be determined). However get_crc_table() returned a pointer to an unsigned long, which could be eight bytes. This fixes that by creating a new z_crc_t type for the crc_table. This type is also used for the BYFOUR crc calculations that depend on a four-byte type. The four-byte type can now be determined by ./configure, which also solves a problem where ./configure --solo would never use BYFOUR. No the Z_U4 #define indicates that four- byte integer was found either by ./configure or by zconf.h.
Diffstat (limited to 'crc32.h')
-rw-r--r--crc32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crc32.h b/crc32.h
index c3e7171..9e0c778 100644
--- a/crc32.h
+++ b/crc32.h
@@ -2,7 +2,7 @@
* Generated automatically by crc32.c
*/
-local const crc_table_t FAR crc_table[TBLS][256] =
+local const z_crc_t FAR crc_table[TBLS][256] =
{
{
0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,