diff options
author | hansr <hk-git@circlestorm.org> | 2014-10-18 12:11:48 +0200 |
---|---|---|
committer | hansr <hk-git@circlestorm.org> | 2014-10-18 12:11:48 +0200 |
commit | 8999d0a963bd0e5080b6ed56bd073d2f5544e982 (patch) | |
tree | 0b4f2186625a4bb19fe53075001c3cbc2c68bf26 /zutil.c | |
parent | de4fe1be2b673051e4773e6d86d7331f6cb14b01 (diff) |
Remove FAR variants of voidpf
And a few Bytef leftovers from test/example.c
Diffstat (limited to 'zutil.c')
-rw-r--r-- | zutil.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -45,7 +45,7 @@ uLong ZEXPORT zlibCompileFlags() case 8: flags += 2 << 2; break; default: flags += 3 << 2; } - switch ((int)(sizeof(voidpf))) { + switch ((int)(sizeof(voidp))) { case 2: break; case 4: flags += 1 << 4; break; case 8: flags += 2 << 4; break; @@ -120,19 +120,19 @@ const char * ZEXPORT zError(err) #ifndef MY_ZCALLOC /* Any system without a special alloc function */ -voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) - voidpf opaque; +voidp ZLIB_INTERNAL zcalloc (opaque, items, size) + voidp opaque; unsigned items; unsigned size; { if (opaque) items += size - size; /* make compiler happy */ - return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : - (voidpf)calloc(items, size); + return sizeof(uInt) > 2 ? (voidp)malloc(items * size) : + (voidp)calloc(items, size); } void ZLIB_INTERNAL zcfree (opaque, ptr) - voidpf opaque; - voidpf ptr; + voidp opaque; + voidp ptr; { free(ptr); if (opaque) return; /* make compiler happy */ |