From: Tor Lillqvist <tlillqvist@novell.com>
Date: Sun, 18 Sep 2011 19:46:44 +0000 (+0200)
Subject: Always add large file support for windows
X-Git-Tag: v1.2.5.2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7142fcfeed453401ee47b0e36b5018a58575c065;p=thirdparty%2Fzlib-ng.git

Always add large file support for windows
---

diff --git a/gzlib.c b/gzlib.c
index 57f79bb8c..7b31d2432 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -5,11 +5,15 @@
 
 #include "gzguts.h"
 
+#if defined(_WIN32)
+#  define LSEEK _lseeki64
+#else
 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
 #  define LSEEK lseek64
 #else
 #  define LSEEK lseek
 #endif
+#endif
 
 /* Local functions */
 local void gz_reset OF((gz_statep));
diff --git a/win32/zlib.def b/win32/zlib.def
index d2e09f214..eee109fc7 100644
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -1,6 +1,4 @@
-LIBRARY
 ; zlib data compression library
-
 EXPORTS
 ; basic functions
     zlibVersion
@@ -58,6 +56,13 @@ EXPORTS
     gzclose_w
     gzerror
     gzclearerr
+; large file functions
+    gzopen64
+    gzseek64
+    gztell64
+    gzoffset64
+    adler32_combine64
+    crc32_combine64
 ; checksum functions
     adler32
     crc32
diff --git a/zconf.h.in b/zconf.h.in
index 1c06556ef..c8c2aaadd 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -412,11 +412,15 @@ typedef uLong FAR uLongf;
 #  define z_off_t long
 #endif
 
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
 #  define z_off64_t off64_t
 #else
+#  if defined(_WIN32)
+#    define z_off64_t __int64
+#  else
 #  define z_off64_t z_off_t
 #endif
+#endif
 
 #if defined(__OS400__)
 #  define NO_vsnprintf
diff --git a/zutil.h b/zutil.h
index 258fa8879..c199b2014 100644
--- a/zutil.h
+++ b/zutil.h
@@ -160,7 +160,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 /* provide prototypes for these when building zlib without LFS */
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 #endif