mchapman/zlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compile option for when z_size_t needs to be a long long.

Browse Source
This commit is contained in:
Mark Adler
2016-12-04 16:50:49 -08:00
parent ca50ebd4df
commit 3f8c768745
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -491,7 +491,7 @@ EOF
int main(void) { int main(void) {
if (sizeof(void *) <= sizeof(int)) puts("int"); if (sizeof(void *) <= sizeof(int)) puts("int");
else if (sizeof(void *) <= sizeof(long)) puts("long"); else if (sizeof(void *) <= sizeof(long)) puts("long");
else puts("long long"); else puts("z_longlong");
return 0; return 0;
} }
EOF EOF

2
zconf.h
View File

@@ -225,6 +225,7 @@
#endif #endif
#ifndef Z_SOLO #ifndef Z_SOLO
# define z_longlong long long
# ifdef NO_SIZE_T # ifdef NO_SIZE_T
typedef unsigned NO_SIZE_T z_size_t; typedef unsigned NO_SIZE_T z_size_t;
# else # else
@@ -237,6 +238,7 @@
# include <sys/types.h> # include <sys/types.h>
typedef ssize_t z_ssize_t; typedef ssize_t z_ssize_t;
# endif # endif
# undef z_longlong
#endif #endif
/* Maximum value for memLevel in deflateInit2 */ /* Maximum value for memLevel in deflateInit2 */

2
zconf.h.cmakein
View File

@@ -227,6 +227,7 @@
#endif #endif
#ifndef Z_SOLO #ifndef Z_SOLO
# define z_longlong long long
# ifdef NO_SIZE_T # ifdef NO_SIZE_T
typedef unsigned NO_SIZE_T z_size_t; typedef unsigned NO_SIZE_T z_size_t;
# else # else
@@ -239,6 +240,7 @@
# include <sys/types.h> # include <sys/types.h>
typedef ssize_t z_ssize_t; typedef ssize_t z_ssize_t;
# endif # endif
# undef z_longlong
#endif #endif
/* Maximum value for memLevel in deflateInit2 */ /* Maximum value for memLevel in deflateInit2 */

2
zconf.h.in
View File

@@ -225,6 +225,7 @@
#endif #endif
#ifndef Z_SOLO #ifndef Z_SOLO
# define z_longlong long long
# ifdef NO_SIZE_T # ifdef NO_SIZE_T
typedef unsigned NO_SIZE_T z_size_t; typedef unsigned NO_SIZE_T z_size_t;
# else # else
@@ -237,6 +238,7 @@
# include <sys/types.h> # include <sys/types.h>
typedef ssize_t z_ssize_t; typedef ssize_t z_ssize_t;
# endif # endif
# undef z_longlong
#endif #endif
/* Maximum value for memLevel in deflateInit2 */ /* Maximum value for memLevel in deflateInit2 */