diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2016-12-30 23:40:43 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2016-12-30 23:42:22 -0800 |
| commit | f3fcb92cf6c81b3ecd04b3ceb9243548b80c0cd9 (patch) | |
| tree | d62afbe47b146d7d32186f7df442952e19985d03 | |
| parent | 8f147c3d12591a811c5438c011d4203bb7fc5260 (diff) | |
| download | zlib-f3fcb92cf6c81b3ecd04b3ceb9243548b80c0cd9.tar.gz zlib-f3fcb92cf6c81b3ecd04b3ceb9243548b80c0cd9.tar.bz2 zlib-f3fcb92cf6c81b3ecd04b3ceb9243548b80c0cd9.zip | |
Use intptr_t for z_ssize_t on MSVC.
| -rw-r--r-- | zconf.h | 7 | ||||
| -rw-r--r-- | zconf.h.cmakein | 7 | ||||
| -rw-r--r-- | zconf.h.in | 7 |
3 files changed, 18 insertions, 3 deletions
| @@ -240,8 +240,13 @@ | |||
| 240 | # ifdef NO_SSIZE_T | 240 | # ifdef NO_SSIZE_T |
| 241 | typedef NO_SSIZE_T z_ssize_t; | 241 | typedef NO_SSIZE_T z_ssize_t; |
| 242 | # else | 242 | # else |
| 243 | # include <stddef.h> | ||
| 243 | # include <sys/types.h> | 244 | # include <sys/types.h> |
| 244 | typedef ssize_t z_ssize_t; | 245 | # ifdef _MSC_VER |
| 246 | typedef intptr_t z_ssize_t; | ||
| 247 | # else | ||
| 248 | typedef ssize_t z_ssize_t; | ||
| 249 | # endif | ||
| 245 | # endif | 250 | # endif |
| 246 | # undef z_longlong | 251 | # undef z_longlong |
| 247 | #endif | 252 | #endif |
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index fe97071..843aeb4 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
| @@ -242,8 +242,13 @@ | |||
| 242 | # ifdef NO_SSIZE_T | 242 | # ifdef NO_SSIZE_T |
| 243 | typedef NO_SSIZE_T z_ssize_t; | 243 | typedef NO_SSIZE_T z_ssize_t; |
| 244 | # else | 244 | # else |
| 245 | # include <stddef.h> | ||
| 245 | # include <sys/types.h> | 246 | # include <sys/types.h> |
| 246 | typedef ssize_t z_ssize_t; | 247 | # ifdef _MSC_VER |
| 248 | typedef intptr_t z_ssize_t; | ||
| 249 | # else | ||
| 250 | typedef ssize_t z_ssize_t; | ||
| 251 | # endif | ||
| 247 | # endif | 252 | # endif |
| 248 | # undef z_longlong | 253 | # undef z_longlong |
| 249 | #endif | 254 | #endif |
| @@ -240,8 +240,13 @@ | |||
| 240 | # ifdef NO_SSIZE_T | 240 | # ifdef NO_SSIZE_T |
| 241 | typedef NO_SSIZE_T z_ssize_t; | 241 | typedef NO_SSIZE_T z_ssize_t; |
| 242 | # else | 242 | # else |
| 243 | # include <stddef.h> | ||
| 243 | # include <sys/types.h> | 244 | # include <sys/types.h> |
| 244 | typedef ssize_t z_ssize_t; | 245 | # ifdef _MSC_VER |
| 246 | typedef intptr_t z_ssize_t; | ||
| 247 | # else | ||
| 248 | typedef ssize_t z_ssize_t; | ||
| 249 | # endif | ||
| 245 | # endif | 250 | # endif |
| 246 | # undef z_longlong | 251 | # undef z_longlong |
| 247 | #endif | 252 | #endif |