[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1387] trunk/lvzip/c_source

[<lab...@us...>]

Revision: 1387
          http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1387&view=rev
Author:   labviewer
Date:     2011-06-27 13:12:35 +0000 (Mon, 27 Jun 2011)

Log Message:
-----------
Fix some 64 bit troubles not yet in zlib 1.2.5

Modified Paths:
--------------
    trunk/lvzip/c_source/zconf.h
    trunk/lvzip/c_source/zlib.h

Modified: trunk/lvzip/c_source/zconf.h
===================================================================
--- trunk/lvzip/c_source/zconf.h	2011-05-18 12:24:37 UTC (rev 1386)
+++ trunk/lvzip/c_source/zconf.h	2011-06-27 13:12:35 UTC (rev 1387)
@@ -375,7 +375,11 @@
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define Z_LARGE
+#endif
+
+#if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)
 #  include <unistd.h>       /* for SEEK_* and off_t */
 #  ifdef VMS
 #    include <unixio.h>     /* for off_t */

Modified: trunk/lvzip/c_source/zlib.h
===================================================================
--- trunk/lvzip/c_source/zlib.h	2011-05-18 12:24:37 UTC (rev 1386)
+++ trunk/lvzip/c_source/zlib.h	2011-06-27 13:12:35 UTC (rev 1387)
@@ -1573,13 +1573,22 @@
 #endif
 
 #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-#  define gzopen gzopen64
-#  define gzseek gzseek64
-#  define gztell gztell64
-#  define gzoffset gzoffset64
-#  define adler32_combine adler32_combine64
-#  define crc32_combine crc32_combine64
-#  ifdef _LARGEFILE64_SOURCE
+#  ifdef Z_PREFIX_SET
+#    define z_gzopen z_gzopen64
+#    define z_gzseek z_gzseek64
+#    define z_gztell z_gztell64
+#    define z_gzoffset z_gzoffset64
+#    define z_adler32_combine z_adler32_combine64
+#    define z_crc32_combine z_crc32_combine64
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#  endif
+#  ifndef _LARGEFILE64_SOURCE
      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.