diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2013-04-13 15:54:03 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2013-04-13 15:54:03 -0700 |
| commit | 5d33c62c7d7d053a1d55b92c1036e196ed1168bd (patch) | |
| tree | e78bbc7998161b8056ecccf64900ec41c764e95e | |
| parent | 8a93f49c86044934de225a395d3b5b851879257c (diff) | |
| download | zlib-5d33c62c7d7d053a1d55b92c1036e196ed1168bd.tar.gz zlib-5d33c62c7d7d053a1d55b92c1036e196ed1168bd.tar.bz2 zlib-5d33c62c7d7d053a1d55b92c1036e196ed1168bd.zip | |
Change check for a four-byte type back to hexadecimal.
| -rw-r--r-- | zconf.h | 6 | ||||
| -rw-r--r-- | zconf.h.cmakein | 6 | ||||
| -rw-r--r-- | zconf.h.in | 6 |
3 files changed, 9 insertions, 9 deletions
| @@ -393,11 +393,11 @@ typedef uLong FAR uLongf; | |||
| 393 | 393 | ||
| 394 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) | 394 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) |
| 395 | # include <limits.h> | 395 | # include <limits.h> |
| 396 | # if (UINT_MAX == 4294967295) | 396 | # if (UINT_MAX == 0xffffffffUL) |
| 397 | # define Z_U4 unsigned | 397 | # define Z_U4 unsigned |
| 398 | # elif (ULONG_MAX == 4294967295) | 398 | # elif (ULONG_MAX == 0xffffffffUL) |
| 399 | # define Z_U4 unsigned long | 399 | # define Z_U4 unsigned long |
| 400 | # elif (USHRT_MAX == 4294967295) | 400 | # elif (USHRT_MAX == 0xffffffffUL) |
| 401 | # define Z_U4 unsigned short | 401 | # define Z_U4 unsigned short |
| 402 | # endif | 402 | # endif |
| 403 | #endif | 403 | #endif |
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index a02281a..10e445f 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
| @@ -395,11 +395,11 @@ typedef uLong FAR uLongf; | |||
| 395 | 395 | ||
| 396 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) | 396 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) |
| 397 | # include <limits.h> | 397 | # include <limits.h> |
| 398 | # if (UINT_MAX == 4294967295) | 398 | # if (UINT_MAX == 0xffffffffUL) |
| 399 | # define Z_U4 unsigned | 399 | # define Z_U4 unsigned |
| 400 | # elif (ULONG_MAX == 4294967295) | 400 | # elif (ULONG_MAX == 0xffffffffUL) |
| 401 | # define Z_U4 unsigned long | 401 | # define Z_U4 unsigned long |
| 402 | # elif (USHRT_MAX == 4294967295) | 402 | # elif (USHRT_MAX == 0xffffffffUL) |
| 403 | # define Z_U4 unsigned short | 403 | # define Z_U4 unsigned short |
| 404 | # endif | 404 | # endif |
| 405 | #endif | 405 | #endif |
| @@ -393,11 +393,11 @@ typedef uLong FAR uLongf; | |||
| 393 | 393 | ||
| 394 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) | 394 | #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) |
| 395 | # include <limits.h> | 395 | # include <limits.h> |
| 396 | # if (UINT_MAX == 4294967295) | 396 | # if (UINT_MAX == 0xffffffffUL) |
| 397 | # define Z_U4 unsigned | 397 | # define Z_U4 unsigned |
| 398 | # elif (ULONG_MAX == 4294967295) | 398 | # elif (ULONG_MAX == 0xffffffffUL) |
| 399 | # define Z_U4 unsigned long | 399 | # define Z_U4 unsigned long |
| 400 | # elif (USHRT_MAX == 4294967295) | 400 | # elif (USHRT_MAX == 0xffffffffUL) |
| 401 | # define Z_U4 unsigned short | 401 | # define Z_U4 unsigned short |
| 402 | # endif | 402 | # endif |
| 403 | #endif | 403 | #endif |