From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Sun, 26 Apr 2015 19:10:12 +0000 (+0200)
Subject: Cleanup: Replace 'voidpf' with 'void *'
X-Git-Tag: 1.9.9-b1~874
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=429cebfd68ee7615123653e64ce18de6f499030f;p=thirdparty%2Fzlib-ng.git

Cleanup: Replace 'voidpf' with 'void *'
---

diff --git a/zutil.h b/zutil.h
index c0fd76225..5feddb24e 100644
--- a/zutil.h
+++ b/zutil.h
@@ -131,13 +131,13 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size);
-   void   ZLIB_INTERNAL zcfree  (voidpf opaque, voidpf ptr);
+   void ZLIB_INTERNAL *zcalloc (void *opaque, unsigned items, unsigned size);
+   void ZLIB_INTERNAL  zcfree  (void *opaque, void *ptr);
 #endif
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (void *)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
 /* Reverse the bytes in a 32-bit value. Use compiler intrinsics when