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.cmakein | |
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.cmakein')
-rw-r--r-- | zconf.h.cmakein | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 028be15..9254e9a 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
@@ -392,20 +392,14 @@ typedef uLong FAR uLongf; | |||
392 | typedef Byte *voidp; | 392 | typedef Byte *voidp; |
393 | #endif | 393 | #endif |
394 | 394 | ||
395 | /* ./configure may #define Z_U4 here */ | ||
396 | |||
397 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) | 395 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) |
398 | # include <limits.h> | 396 | # include <limits.h> |
399 | # if (UINT_MAX == 0xffffffffUL) | 397 | # if (UINT_MAX == 4294967295) |
400 | # define Z_U4 unsigned | 398 | # define Z_U4 unsigned |
401 | # else | 399 | # elif (ULONG_MAX == 4294967295) |
402 | # if (ULONG_MAX == 0xffffffffUL) | 400 | # define Z_U4 unsigned long |
403 | # define Z_U4 unsigned long | 401 | # elif (USHRT_MAX == 4294967295) |
404 | # else | 402 | # define Z_U4 unsigned short |
405 | # if (USHRT_MAX == 0xffffffffUL) | ||
406 | # define Z_U4 unsigned short | ||
407 | # endif | ||
408 | # endif | ||
409 | # endif | 403 | # endif |
410 | #endif | 404 | #endif |
411 | 405 | ||