diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-10-28 09:25:54 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-10-28 09:25:54 +0000 |
| commit | 7349ad5b6f0534daa29eb54d13b0052f1d6d96b9 (patch) | |
| tree | 1f764ffb40b0c1c91b289d083f764fc88984ae72 | |
| parent | Use uint_least*_t types. (diff) | |
| download | rtems-7349ad5b6f0534daa29eb54d13b0052f1d6d96b9.tar.bz2 | |
Misc. type fixes
| -rw-r--r-- | cpukit/zlib/crc32.c | 12 | ||||
| -rw-r--r-- | cpukit/zlib/zutil.c | 4 | ||||
| -rw-r--r-- | cpukit/zlib/zutil.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cpukit/zlib/crc32.c b/cpukit/zlib/crc32.c index eeb2147653..51d5504035 100644 --- a/cpukit/zlib/crc32.c +++ b/cpukit/zlib/crc32.c @@ -201,13 +201,13 @@ local void write_table(out, table) /* ========================================================================= * 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 if (crc_table_empty) make_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 /* ========================================================================= */ -unsigned long ZEXPORT crc32(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; +uLong ZEXPORT crc32(crc, buf, len) + uLong crc; + const Bytef *buf; + uInt len; { if (buf == Z_NULL) return 0UL; diff --git a/cpukit/zlib/zutil.c b/cpukit/zlib/zutil.c index 59377f6121..c7e14bf9fd 100644 --- a/cpukit/zlib/zutil.c +++ b/cpukit/zlib/zutil.c @@ -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) : diff --git a/cpukit/zlib/zutil.h b/cpukit/zlib/zutil.h index 58908dd3a3..601aeb2ccf 100644 --- a/cpukit/zlib/zutil.h +++ b/cpukit/zlib/zutil.h @@ -251,7 +251,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) \ |