From b864c387e8f16273aad1453d6457d847e29c3d25 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 22 Sep 2010 22:32:56 -0400 Subject: mtd-utils: clean up zlib.h usage a bit Hide zlib's crc32 in compr_zlib.c and mkfs.ubifs/compr.c. jffs2reader.c and mkfs.jffs2.c don't actually use zlib, so punt the include from the file. mkfs.jffs2.c is implicitly using crc32 from zlib.h instead of the local mtd_crc32, so fix the local usage. otherwise we get warnings about undefined crc32 because the file was redirecting the prototype. Signed-off-by: Mike Frysinger Signed-off-by: Artem Bityutskiy --- mkfs.ubifs/compr.c | 1 + 1 file changed, 1 insertion(+) (limited to 'mkfs.ubifs') diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c index 7f084c5..4152b6a 100644 --- a/mkfs.ubifs/compr.c +++ b/mkfs.ubifs/compr.c @@ -29,6 +29,7 @@ #define crc32 __zlib_crc32 #include +#undef crc32 #include "compr.h" #include "ubifs-media.h" -- cgit v1.2.3