Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-21 15:54:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make code match prototype to eliminate warnings.

Browse Source 
eliminate unneeded comilation of 64 bit functions
This commit is contained in:
Thomas Doerfler
2011-03-18 10:11:37 +00:00
parent a9503cc97c
commit 28947389ae
7 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/zlib/ChangeLog
+7 -1
View File
@@ -1,3 +1,9 @@
2010-03-26 Thomas Doerfler <Thomas.Doerfler@embeded-brains.de>
* zlib.h, zutil.c, zutil.h, gzlib.c, crc32.c, adler32.c:
Make code match prototype to eliminate warnings.
eliminate unneeded comilation of 64 bit functions
2010-03-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* ChangeLog.zlib, FAQ, Makefile.am, README, adler32.c, compress.c,
@@ -14,7 +20,7 @@
2008-09-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* adler32.c, compress.c, crc32.c, deflate.c, gzio.c, infback.c,
* adler32.c, compress.c, crc32.c, deflate.c, gzio.c, infback.c,
inflate.c, inffast.c, inftrees.c, trees.c, uncompr.c, zutil.c:
Stop using old-style function definitions.
cpukit/zlib/adler32.c
+2
View File
@@ -160,6 +160,7 @@ uLong ZEXPORT adler32_combine(adler1, adler2, len2)
return adler32_combine_(adler1, adler2, len2);
}
#if (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64))
uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
uLong adler1;
uLong adler2;
@@ -167,3 +168,4 @@ uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
{
return adler32_combine_(adler1, adler2, len2);
}
#endif /* (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64)) */
cpukit/zlib/crc32.c
+2
View File
@@ -433,6 +433,7 @@ uLong ZEXPORT crc32_combine(crc1, crc2, len2)
return crc32_combine_(crc1, crc2, len2);
}
#if (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64))
uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
uLong crc1;
uLong crc2;
@@ -440,3 +441,4 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
{
return crc32_combine_(crc1, crc2, len2);
}
#endif /* (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64)) */
cpukit/zlib/gzlib.c
+3
View File
@@ -199,6 +199,7 @@ gzFile ZEXPORT gzopen(path, mode)
return gz_open(path, -1, mode);
}
#if (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64))
/* -- see zlib.h -- */
gzFile ZEXPORT gzopen64(path, mode)
const char *path;
@@ -206,6 +207,7 @@ gzFile ZEXPORT gzopen64(path, mode)
{
return gz_open(path, -1, mode);
}
#endif /* (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64)) */
/* -- see zlib.h -- */
gzFile ZEXPORT gzdopen(fd, mode)
@@ -386,6 +388,7 @@ z_off_t ZEXPORT gztell(file)
}
/* -- see zlib.h -- */
z_off64_t ZEXPORT gzoffset64(file)
gzFile file;
{
cpukit/zlib/zlib.h
+5
View File
@@ -1587,6 +1587,11 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
# ifndef _LARGEFILE64_SOURCE
ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
# endif
#endif
#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
cpukit/zlib/zutil.c
+2 -2
View File
@@ -299,8 +299,8 @@ extern void free OF((voidpf ptr));
voidpf zcalloc (opaque, items, size)
voidpf opaque;
unsigned items;
unsigned size;
uInt items;
uInt size;
{
if (opaque) items += size - size; /* make compiler happy */
return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
cpukit/zlib/zutil.h
+1 -1
View File
@@ -276,7 +276,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#endif
voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
voidpf zcalloc OF((voidpf opaque, uInt items, uInt size));
void zcfree OF((voidpf opaque, voidpf ptr));
#define ZALLOC(strm, items, size) \