[prev in list] [next in list] [prev in thread] [next in thread] 

List:       varnish-commit
Subject:    [master] 149fde9 Try to solve the 32/64 bit issue with a less
From:       phk () varnish-cache ! org (Poul-Henning Kamp)
Date:       2011-03-28 10:36:12
Message-ID: E1Q49nw-0006NP-Kx () project ! varnish-software ! com
[Download RAW message or body]

commit 149fde9211490ccfa2c5984abe4c2f7e9eb7cf53
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Mar 28 10:35:41 2011 +0000

    Try to solve the 32/64 bit issue with a less draconian #ifdef,
    this looks like it helps PPC64 platform.

diff --git a/lib/libvgz/vgz.h b/lib/libvgz/vgz.h
index 1b8da5e..f082e41 100644
--- a/lib/libvgz/vgz.h
+++ b/lib/libvgz/vgz.h
@@ -1575,14 +1575,14 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
 #endif
 
-#if defined(NOTDEF) && !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
+#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 _LARGEFILE64_SOURCExxx
      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));


[prev in list] [next in list] [prev in thread] [next in thread]