Merge the zlib fix properly; back out tridge's bandaid.

[rsync/rsync.git] / zlib / zutil.h

diff --git a/zlib/zutil.h b/zlib/zutil.h
index fbf2a98..f1d583e 100644 (file)
--- a/zlib/zutil.h
+++ b/zlib/zutil.h
@@ -217,7 +217,7 @@ void   zcfree  OF((voidpf opaque, voidpf ptr));
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  ((*((strm)->zfree))((strm)->opaque, (voidpf)(addr)),(addr)=NULL)
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
 #endif /* _Z_UTIL_H */