diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-18 20:49:37 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-18 20:49:37 +0000 |
| commit | 738ea752500cc80a37011d080abce756d843095b (patch) | |
| tree | 1f21c61ab356d67951ffec666e9f05910f670c14 /cpukit/zlib/zutil.c | |
| parent | 2008-12-18 Michael Hamel <nigel@adi.co.nz> (diff) | |
| download | rtems-738ea752500cc80a37011d080abce756d843095b.tar.bz2 | |
2008-12-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* zutil.c, zutil.h: Make code match prototype to eliminate warnings.
Diffstat (limited to 'cpukit/zlib/zutil.c')
| -rw-r--r-- | cpukit/zlib/zutil.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cpukit/zlib/zutil.c b/cpukit/zlib/zutil.c index 7d38a3416b..192cc35fcd 100644 --- a/cpukit/zlib/zutil.c +++ b/cpukit/zlib/zutil.c @@ -213,7 +213,7 @@ local ptr_table table[MAX_PTR]; * a protected system like OS/2. Use Microsoft C instead. */ -voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) +voidpf zcalloc (voidpf opaque, uInt items, uInt size) { voidpf buf = opaque; /* just to make some compilers happy */ ulg bsize = (ulg)items*size; @@ -272,7 +272,7 @@ void zcfree (voidpf opaque, voidpf ptr) # define _hfree hfree #endif -voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) +voidpf zcalloc (voidpf opaque, uInt items, uInt size) { if (opaque) opaque = 0; /* to make compiler happy */ return _halloc((long)items, size); @@ -297,10 +297,7 @@ extern voidp calloc OF((uInt items, uInt size)); extern void free OF((voidpf ptr)); #endif -voidpf zcalloc ( - voidpf opaque, - unsigned items, - unsigned size) +voidpf zcalloc (voidpf opaque, uInt items, uInt size) { if (opaque) items += size - size; /* make compiler happy */ return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : |