From b864c387e8f16273aad1453d6457d847e29c3d25 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
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 <vapier@gentoo.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
 compr_zlib.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'compr_zlib.c')

diff --git a/compr_zlib.c b/compr_zlib.c
index 400b18a..db4811d 100644
--- a/compr_zlib.c
+++ b/compr_zlib.c
@@ -33,7 +33,9 @@
  */
 
 #include <stdint.h>
+#define crc32 __zlib_crc32
 #include <zlib.h>
+#undef crc32
 #include <stdio.h>
 #include <asm/types.h>
 #include <linux/jffs2.h>
-- 
cgit v1.2.3