summaryrefslogtreecommitdiff
path: root/mkfs.ubifs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-09-22 22:32:56 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-09-23 16:35:28 +0300
commitb864c387e8f16273aad1453d6457d847e29c3d25 (patch)
tree0060a2d3a8ab1eca6b81eec12a82513fd637aceb /mkfs.ubifs
parent5ac748832661e7924bafd06830a247b6ff34c8c3 (diff)
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>
Diffstat (limited to 'mkfs.ubifs')
-rw-r--r--mkfs.ubifs/compr.c1
1 files changed, 1 insertions, 0 deletions
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 <zlib.h>
+#undef crc32
#include "compr.h"
#include "ubifs-media.h"