From: Mark Adler Date: Sat, 13 Apr 2013 22:54:03 +0000 (-0700) Subject: Change check for a four-byte type back to hexadecimal. X-Git-Tag: v1.2.7.2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d33c62c7d7d053a1d55b92c1036e196ed1168bd;p=thirdparty%2Fzlib-ng.git Change check for a four-byte type back to hexadecimal. --- diff --git a/zconf.h b/zconf.h index 80de2ce63..7a9d8f21b 100644 --- a/zconf.h +++ b/zconf.h @@ -393,11 +393,11 @@ typedef uLong FAR uLongf; #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) # include -# if (UINT_MAX == 4294967295) +# if (UINT_MAX == 0xffffffffUL) # define Z_U4 unsigned -# elif (ULONG_MAX == 4294967295) +# elif (ULONG_MAX == 0xffffffffUL) # define Z_U4 unsigned long -# elif (USHRT_MAX == 4294967295) +# elif (USHRT_MAX == 0xffffffffUL) # define Z_U4 unsigned short # endif #endif diff --git a/zconf.h.cmakein b/zconf.h.cmakein index a02281ab0..10e445f21 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein @@ -395,11 +395,11 @@ typedef uLong FAR uLongf; #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) # include -# if (UINT_MAX == 4294967295) +# if (UINT_MAX == 0xffffffffUL) # define Z_U4 unsigned -# elif (ULONG_MAX == 4294967295) +# elif (ULONG_MAX == 0xffffffffUL) # define Z_U4 unsigned long -# elif (USHRT_MAX == 4294967295) +# elif (USHRT_MAX == 0xffffffffUL) # define Z_U4 unsigned short # endif #endif diff --git a/zconf.h.in b/zconf.h.in index 80de2ce63..7a9d8f21b 100644 --- a/zconf.h.in +++ b/zconf.h.in @@ -393,11 +393,11 @@ typedef uLong FAR uLongf; #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) # include -# if (UINT_MAX == 4294967295) +# if (UINT_MAX == 0xffffffffUL) # define Z_U4 unsigned -# elif (ULONG_MAX == 4294967295) +# elif (ULONG_MAX == 0xffffffffUL) # define Z_U4 unsigned long -# elif (USHRT_MAX == 4294967295) +# elif (USHRT_MAX == 0xffffffffUL) # define Z_U4 unsigned short # endif #endif