Misc. type fixes

This commit is contained in:
Ralf Corsepius
2005-10-28 09:25:54 +00:00
parent ce661e68db
commit 7349ad5b6f
3 changed files with 9 additions and 9 deletions

View File

@@ -201,13 +201,13 @@ local void write_table(out, table)
/* ========================================================================= /* =========================================================================
* This function can be used by asm versions of crc32() * This function can be used by asm versions of crc32()
*/ */
const unsigned long FAR * ZEXPORT get_crc_table() const uLongf * ZEXPORT get_crc_table()
{ {
#ifdef DYNAMIC_CRC_TABLE #ifdef DYNAMIC_CRC_TABLE
if (crc_table_empty) if (crc_table_empty)
make_crc_table(); make_crc_table();
#endif /* DYNAMIC_CRC_TABLE */ #endif /* DYNAMIC_CRC_TABLE */
return (const unsigned long FAR *)crc_table; return (const uLongf *)crc_table;
} }
/* ========================================================================= */ /* ========================================================================= */
@@ -215,10 +215,10 @@ const unsigned long FAR * ZEXPORT get_crc_table()
#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
/* ========================================================================= */ /* ========================================================================= */
unsigned long ZEXPORT crc32(crc, buf, len) uLong ZEXPORT crc32(crc, buf, len)
unsigned long crc; uLong crc;
const unsigned char FAR *buf; const Bytef *buf;
unsigned len; uInt len;
{ {
if (buf == Z_NULL) return 0UL; if (buf == Z_NULL) return 0UL;

View File

@@ -299,8 +299,8 @@ extern void free OF((voidpf ptr));
voidpf zcalloc (opaque, items, size) voidpf zcalloc (opaque, items, size)
voidpf opaque; voidpf opaque;
unsigned items; uInt items;
unsigned size; uInt size;
{ {
if (opaque) items += size - size; /* make compiler happy */ if (opaque) items += size - size; /* make compiler happy */
return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :

View File

@@ -251,7 +251,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#endif #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)); void zcfree OF((voidpf opaque, voidpf ptr));
#define ZALLOC(strm, items, size) \ #define ZALLOC(strm, items, size) \