diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-02-20 09:24:30 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-02-20 09:24:30 -0800 |
| commit | 80f3e39eb858db060d9edede6edf7592b7f24934 (patch) | |
| tree | 3dbe26b9a89155367fed2b01e5ce5580f982322d | |
| parent | 3f4339b61b3737f6efdd55368488f0a5888e4935 (diff) | |
| download | zlib-80f3e39eb858db060d9edede6edf7592b7f24934.tar.gz zlib-80f3e39eb858db060d9edede6edf7592b7f24934.tar.bz2 zlib-80f3e39eb858db060d9edede6edf7592b7f24934.zip | |
Avoid using __int64 for gcc or solo compilation.
| -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
| @@ -439,11 +439,11 @@ typedef uLong FAR uLongf; | |||
| 439 | #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0) | 439 | #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0) |
| 440 | # define z_off64_t off64_t | 440 | # define z_off64_t off64_t |
| 441 | #else | 441 | #else |
| 442 | # if defined(_WIN32) | 442 | # if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) |
| 443 | # define z_off64_t __int64 | 443 | # define z_off64_t __int64 |
| 444 | # else | 444 | # else |
| 445 | # define z_off64_t z_off_t | 445 | # define z_off64_t z_off_t |
| 446 | #endif | 446 | # endif |
| 447 | #endif | 447 | #endif |
| 448 | 448 | ||
| 449 | /* MVS linker does not support external names larger than 8 bytes */ | 449 | /* MVS linker does not support external names larger than 8 bytes */ |
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 8109100..dd2d28a 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
| @@ -441,11 +441,11 @@ typedef uLong FAR uLongf; | |||
| 441 | #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0) | 441 | #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0) |
| 442 | # define z_off64_t off64_t | 442 | # define z_off64_t off64_t |
| 443 | #else | 443 | #else |
| 444 | # if defined(_WIN32) | 444 | # if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) |
| 445 | # define z_off64_t __int64 | 445 | # define z_off64_t __int64 |
| 446 | # else | 446 | # else |
| 447 | # define z_off64_t z_off_t | 447 | # define z_off64_t z_off_t |
| 448 | #endif | 448 | # endif |
| 449 | #endif | 449 | #endif |
| 450 | 450 | ||
| 451 | /* MVS linker does not support external names larger than 8 bytes */ | 451 | /* MVS linker does not support external names larger than 8 bytes */ |
| @@ -439,11 +439,11 @@ typedef uLong FAR uLongf; | |||
| 439 | #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0) | 439 | #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0) |
| 440 | # define z_off64_t off64_t | 440 | # define z_off64_t off64_t |
| 441 | #else | 441 | #else |
| 442 | # if defined(_WIN32) | 442 | # if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) |
| 443 | # define z_off64_t __int64 | 443 | # define z_off64_t __int64 |
| 444 | # else | 444 | # else |
| 445 | # define z_off64_t z_off_t | 445 | # define z_off64_t z_off_t |
| 446 | #endif | 446 | # endif |
| 447 | #endif | 447 | #endif |
| 448 | 448 | ||
| 449 | /* MVS linker does not support external names larger than 8 bytes */ | 449 | /* MVS linker does not support external names larger than 8 bytes */ |