From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 20 Feb 2012 17:24:30 +0000 (-0800)
Subject: Avoid using __int64 for gcc or solo compilation.
X-Git-Tag: upstream/1.2.8~123
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80f3e39eb858db060d9edede6edf7592b7f24934;p=platform%2Fupstream%2Fzlib.git

Avoid using __int64 for gcc or solo compilation.
---

diff --git a/zconf.h b/zconf.h
index 254d7b5..57f25ad 100644
--- a/zconf.h
+++ b/zconf.h
@@ -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 */
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;
 #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 */
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 */