From 3f73bfb3e09c407425245aa5f62477fd572328c9 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 18 Feb 2024 13:52:42 +0100 Subject: Make it possible to compile jffsX-utils without zlib The jffsX-utils already have a CONFIG_JFFS2_ZLIB define, but it is statically defined in a header and not used consistently. This patch first replaces it with a "WITH_ZLIB" define, provided via automake, to bring it in line with the already existing "WITH_LZO". Then, the missing checks and typedefs are added in jffs2reader.c. Signed-off-by: David Oberhollenzer --- jffsX-utils/compr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'jffsX-utils/compr.c') diff --git a/jffsX-utils/compr.c b/jffsX-utils/compr.c index 42d8a70..01176eb 100644 --- a/jffsX-utils/compr.c +++ b/jffsX-utils/compr.c @@ -511,7 +511,7 @@ reinsert: int jffs2_compressors_init(void) { -#ifdef CONFIG_JFFS2_ZLIB +#ifdef WITH_ZLIB jffs2_zlib_init(); #endif #ifdef CONFIG_JFFS2_RTIME @@ -528,7 +528,7 @@ int jffs2_compressors_exit(void) #ifdef CONFIG_JFFS2_RTIME jffs2_rtime_exit(); #endif -#ifdef CONFIG_JFFS2_ZLIB +#ifdef WITH_ZLIB jffs2_zlib_exit(); #endif #ifdef WITH_LZO -- cgit v1.2.3