Merge branch 'jc/convert'

diff --git a/csum-file.c b/csum-file.c
index 4d50cc5ce18c24a1dc853d3050062b864fe0b943..be49d5fcf900cb47cb14d8c85a69112b26532b93 100644 (file)
--- a/csum-file.c
+++ b/csum-file.c
@@ -116,7 +116,7 @@ struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp
 
 void crc32_begin(struct sha1file *f)
 {
-       f->crc32 = crc32(0, Z_NULL, 0);
+       f->crc32 = crc32(0, NULL, 0);
        f->do_crc = 1;
 }