diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2016-12-31 16:41:36 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2016-12-31 17:50:39 -0800 |
| commit | 61b91f27f87f03d67ee5ecfa5fc66b16dd5e3019 (patch) | |
| tree | a4b929697589108d52c7da9502f81b67feb8020b | |
| parent | cca27e95cf2bf057b2bbea93702135da3ca7be45 (diff) | |
| download | zlib-61b91f27f87f03d67ee5ecfa5fc66b16dd5e3019.tar.gz | |
Make z_size_t unsigned long for non-standard C.
Also declare z_size_t when compiling solo.
| -rw-r--r-- | zconf.h | 10 | ||||
| -rw-r--r-- | zconf.h.cmakein | 10 | ||||
| -rw-r--r-- | zconf.h.in | 10 |
3 files changed, 21 insertions, 9 deletions
@@ -229,13 +229,17 @@ # define z_const #endif -#ifndef Z_SOLO +#ifdef Z_SOLO + typedef unsigned long z_size_t; +#else # define z_longlong long long -# ifdef NO_SIZE_T +# if defined(NO_SIZE_T) typedef unsigned NO_SIZE_T z_size_t; -# else +# elif defined(STDC) # include <stddef.h> typedef size_t z_size_t; +# else + typedef unsigned long z_size_t; # endif # undef z_longlong #endif diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 31619f3..27a220b 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein @@ -231,13 +231,17 @@ # define z_const #endif -#ifndef Z_SOLO +#ifdef Z_SOLO + typedef unsigned long z_size_t; +#else # define z_longlong long long -# ifdef NO_SIZE_T +# if defined(NO_SIZE_T) typedef unsigned NO_SIZE_T z_size_t; -# else +# elif defined(STDC) # include <stddef.h> typedef size_t z_size_t; +# else + typedef unsigned long z_size_t; # endif # undef z_longlong #endif @@ -229,13 +229,17 @@ # define z_const #endif -#ifndef Z_SOLO +#ifdef Z_SOLO + typedef unsigned long z_size_t; +#else # define z_longlong long long -# ifdef NO_SIZE_T +# if defined(NO_SIZE_T) typedef unsigned NO_SIZE_T z_size_t; -# else +# elif defined(STDC) # include <stddef.h> typedef size_t z_size_t; +# else + typedef unsigned long z_size_t; # endif # undef z_longlong #endif |