From 03ff48cc67937fbb026a7952c0351615ef9be4e5 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sat, 23 Mar 2013 22:27:43 -0700 Subject: 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. --- zconf.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'zconf.h') diff --git a/zconf.h b/zconf.h index 95c9ef6..c6ec884 100644 --- a/zconf.h +++ b/zconf.h @@ -390,20 +390,14 @@ typedef uLong FAR uLongf; typedef Byte *voidp; #endif -/* ./configure may #define Z_U4 here */ - #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) # include -# if (UINT_MAX == 0xffffffffUL) +# if (UINT_MAX == 4294967295) # define Z_U4 unsigned -# else -# if (ULONG_MAX == 0xffffffffUL) -# define Z_U4 unsigned long -# else -# if (USHRT_MAX == 0xffffffffUL) -# define Z_U4 unsigned short -# endif -# endif +# elif (ULONG_MAX == 4294967295) +# define Z_U4 unsigned long +# elif (USHRT_MAX == 4294967295) +# define Z_U4 unsigned short # endif #endif -- cgit v1.2.3-55-g6feb