summaryrefslogtreecommitdiff
path: root/zconf.h.in
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-02-20 09:24:30 -0800
committerMark Adler <madler@alumni.caltech.edu>2012-02-20 09:24:30 -0800
commit80f3e39eb858db060d9edede6edf7592b7f24934 (patch)
tree3dbe26b9a89155367fed2b01e5ce5580f982322d /zconf.h.in
parent3f4339b61b3737f6efdd55368488f0a5888e4935 (diff)
downloadzlib-80f3e39eb858db060d9edede6edf7592b7f24934.tar.gz
Avoid using __int64 for gcc or solo compilation.
Diffstat (limited to 'zconf.h.in')
-rw-r--r--zconf.h.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/zconf.h.in b/zconf.h.in
index 254d7b5..57f25ad 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -439,11 +439,11 @@ typedef uLong FAR uLongf;
#if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
# define z_off64_t off64_t
#else
-# if defined(_WIN32)
+# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
# define z_off64_t __int64
# else
-# define z_off64_t z_off_t
-#endif
+# define z_off64_t z_off_t
+# endif
#endif
/* MVS linker does not support external names larger than 8 bytes */