diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2013-03-23 22:27:43 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2013-03-23 22:30:09 -0700 |
commit | 03ff48cc67937fbb026a7952c0351615ef9be4e5 (patch) | |
tree | 3050209fccaad5c9f29f9495f053f9dacde92d6f /zconf.h | |
parent | 66fcefbb2fb867f3f941b71140532de8593f29d6 (diff) | |
download | zlib-03ff48cc67937fbb026a7952c0351615ef9be4e5.tar.gz zlib-03ff48cc67937fbb026a7952c0351615ef9be4e5.tar.bz2 zlib-03ff48cc67937fbb026a7952c0351615ef9be4e5.zip |
Remove runtime check in configure for four-byte integer type.
That didn't work when cross-compiling. Simply rely on limits.h.
If a compiler does not have limits.h, then zconf.h.in should be
modified to define Z_U4 as an unsiged four-byte integer type in
order for crc32() to be fast.
This also simplifies and makes more portable to check for a four-
byte type using limits.h.
Diffstat (limited to 'zconf.h')
-rw-r--r-- | zconf.h | 16 |
1 files changed, 5 insertions, 11 deletions
@@ -390,20 +390,14 @@ typedef uLong FAR uLongf; | |||
390 | typedef Byte *voidp; | 390 | typedef Byte *voidp; |
391 | #endif | 391 | #endif |
392 | 392 | ||
393 | /* ./configure may #define Z_U4 here */ | ||
394 | |||
395 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) | 393 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) |
396 | # include <limits.h> | 394 | # include <limits.h> |
397 | # if (UINT_MAX == 0xffffffffUL) | 395 | # if (UINT_MAX == 4294967295) |
398 | # define Z_U4 unsigned | 396 | # define Z_U4 unsigned |
399 | # else | 397 | # elif (ULONG_MAX == 4294967295) |
400 | # if (ULONG_MAX == 0xffffffffUL) | 398 | # define Z_U4 unsigned long |
401 | # define Z_U4 unsigned long | 399 | # elif (USHRT_MAX == 4294967295) |
402 | # else | 400 | # define Z_U4 unsigned short |
403 | # if (USHRT_MAX == 0xffffffffUL) | ||
404 | # define Z_U4 unsigned short | ||
405 | # endif | ||
406 | # endif | ||
407 | # endif | 401 | # endif |
408 | #endif | 402 | #endif |
409 | 403 | ||