diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2012-04-29 16:18:12 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2012-04-29 16:18:12 -0700 |
commit | 6c9bd474aa08312ef2e2e9655a80e18db24a1680 (patch) | |
tree | 2539e04a1037206dc3853fbdbb33194bb2690aaa /zlib.h | |
parent | 1be117908397b0ce065c07c60fa2b4ae778ff112 (diff) | |
download | zlib-6c9bd474aa08312ef2e2e9655a80e18db24a1680.tar.gz zlib-6c9bd474aa08312ef2e2e9655a80e18db24a1680.tar.bz2 zlib-6c9bd474aa08312ef2e2e9655a80e18db24a1680.zip |
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 'zlib.h')
-rw-r--r-- | zlib.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1728,7 +1728,7 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ | |||
1728 | /* undocumented functions */ | 1728 | /* undocumented functions */ |
1729 | ZEXTERN const char * ZEXPORT zError OF((int)); | 1729 | ZEXTERN const char * ZEXPORT zError OF((int)); |
1730 | ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); | 1730 | ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); |
1731 | ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); | 1731 | ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void)); |
1732 | ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); | 1732 | ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); |
1733 | ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); | 1733 | ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); |
1734 | ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); | 1734 | ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); |