Changeset 2894738 in rtems


Ignore:
Timestamp:
Mar 18, 2011, 10:11:37 AM (9 years ago)
Author:
Thomas Doerfler <Thomas.Doerfler@…>
Branches:
4.11, master
Children:
8b631cc
Parents:
a9503cc
Message:

Make code match prototype to eliminate warnings.
eliminate unneeded comilation of 64 bit functions

Location:
cpukit/zlib
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • cpukit/zlib/ChangeLog

    ra9503cc r2894738  
     12010-03-26      Thomas Doerfler <Thomas.Doerfler@embeded-brains.de>
     2
     3        * zlib.h, zutil.c, zutil.h, gzlib.c, crc32.c, adler32.c:
     4        Make code match prototype to eliminate warnings.
     5        eliminate unneeded comilation of 64 bit functions
     6
    172010-03-22      Joel Sherrill <joel.sherrill@oarcorp.com>
    28
     
    15212008-09-02      Ralf Corsépius <ralf.corsepius@rtems.org>
    1622
    17         * adler32.c, compress.c, crc32.c, deflate.c, gzio.c, infback.c, 
     23        * adler32.c, compress.c, crc32.c, deflate.c, gzio.c, infback.c,
    1824        inflate.c, inffast.c, inftrees.c, trees.c, uncompr.c, zutil.c:
    1925        Stop using old-style function definitions.
  • cpukit/zlib/adler32.c

    ra9503cc r2894738  
    161161}
    162162
     163#if (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64))
    163164uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
    164165    uLong adler1;
     
    168169    return adler32_combine_(adler1, adler2, len2);
    169170}
     171#endif /* (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64)) */
  • cpukit/zlib/crc32.c

    ra9503cc r2894738  
    434434}
    435435
     436#if (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64))
    436437uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
    437438    uLong crc1;
     
    441442    return crc32_combine_(crc1, crc2, len2);
    442443}
     444#endif /* (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64)) */
  • cpukit/zlib/gzlib.c

    ra9503cc r2894738  
    200200}
    201201
     202#if (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64))
    202203/* -- see zlib.h -- */
    203204gzFile ZEXPORT gzopen64(path, mode)
     
    207208    return gz_open(path, -1, mode);
    208209}
     210#endif /* (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64)) */
    209211
    210212/* -- see zlib.h -- */
     
    387389
    388390/* -- see zlib.h -- */
     391
    389392z_off64_t ZEXPORT gzoffset64(file)
    390393    gzFile file;
  • cpukit/zlib/zlib.h

    ra9503cc r2894738  
    15881588   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
    15891589   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
     1590#  ifndef _LARGEFILE64_SOURCE
     1591     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
     1592     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
     1593     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
     1594#  endif
    15901595#endif
    15911596
  • cpukit/zlib/zutil.c

    ra9503cc r2894738  
    300300voidpf zcalloc (opaque, items, size)
    301301    voidpf opaque;
    302     unsigned items;
    303     unsigned size;
     302    uInt items;
     303    uInt size;
    304304{
    305305    if (opaque) items += size - size; /* make compiler happy */
  • cpukit/zlib/zutil.h

    ra9503cc r2894738  
    277277
    278278
    279 voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
     279voidpf zcalloc OF((voidpf opaque, uInt items, uInt size));
    280280void   zcfree  OF((voidpf opaque, voidpf ptr));
    281281
Note: See TracChangeset for help on using the changeset viewer.