← Back to branch summary

~ubuntu-branches/ubuntu/vivid/zlib/vivid-proposed

« back to all changes in this revision

Viewing changes to zlib.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2009-09-08 10:39:15 UTC
  • Revision ID: james.westby@ubuntu.com-20090908103915-r72qim9brkfylex6
Tags: 1:1.2.3.3.dfsg-13ubuntu3
* zlib.h:
  - add z_off64_t and ensure that its mapped to the correct
    off_t or off64_t (fixes FTBFS in vips, gtk)

Show diffs side-by-side

added added

removed removed

Lines of Context:
zlib.h
1361
1361
        inflateBackInit_((strm), (windowBits), (window), \
1362
1362
                                            ZLIB_VERSION, sizeof(z_stream))
1363
1363
 
 
1364
#if defined(_LARGEFILE64_SOURCE)
 
1365
    #define z_off64_t off64_t
 
1366
#else 
 
1367
    #if _FILE_OFFSET_BITS == 64
 
1368
        #define z_off64_t off_t
 
1369
    #endif
 
1370
#endif
 
1371
 
1364
1372
#if defined(_LARGEFILE64_SOURCE) || _FILE_OFFSET_BITS == 64
1365
1373
   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
1366
 
   ZEXTERN off64_t ZEXPORT gzseek64 OF((gzFile, off64_t, int));
1367
 
   ZEXTERN off64_t ZEXPORT gztell64 OF((gzFile));
1368
 
   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off64_t));
1369
 
   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off64_t));
 
1374
   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
 
1375
   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
 
1376
   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
 
1377
   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
1370
1378
#endif
1371
1379
 
1372
1380
#if _FILE_OFFSET_BITS == 64