diff options
| author | wdenk | 2005-05-05 09:51:44 +0000 |
|---|---|---|
| committer | wdenk | 2005-05-05 09:51:44 +0000 |
| commit | 412babe304b948e1e3a909f8d2eb091b83f700d5 (patch) | |
| tree | fde6b10727916e1ec0684bd6a9fa863785ed2169 /include/jffs2 | |
| parent | 60fc6cbbb7d49895e3ee552539f5375f8f1303b5 (diff) | |
It's better to handle LZO and LZARI compression mdoes for JFFS2 with
a single #define.
Diffstat (limited to 'include/jffs2')
| -rw-r--r-- | include/jffs2/jffs2.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index 2fec488d1af..0197dfd86c3 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -65,10 +65,14 @@ #define JFFS2_COMPR_COPY 0x04 #define JFFS2_COMPR_DYNRUBIN 0x05 #define JFFS2_COMPR_ZLIB 0x06 +#if defined(CONFIG_JFFS2_LZO_LZARI) #define JFFS2_COMPR_LZO 0x07 #define JFFS2_COMPR_LZARI 0x08 #define JFFS2_NUM_COMPR 9 - +#else +#define JFFS2_NUM_COMPR 7 +#endif + /* Compatibility flags. */ #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ #define JFFS2_NODE_ACCURATE 0x2000 @@ -203,13 +207,11 @@ void dynrubin_decompress(unsigned char *data_in, unsigned char *cpage_out, unsigned long sourcelen, unsigned long dstlen); long zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, __u32 srclen, __u32 destlen); -#if defined(CONFIG_JFFS2_LZARI) -int lzari_decompress(unsigned char *data_in, unsigned char *cpage_out, - u32 srclen, u32 destlen); -#endif -#if defined(CONFIG_JFFS2_LZO) +#if defined(CONFIG_JFFS2_LZO_LZARI) int lzo_decompress(unsigned char *data_in, unsigned char *cpage_out, u32 srclen, u32 destlen); +int lzari_decompress(unsigned char *data_in, unsigned char *cpage_out, + u32 srclen, u32 destlen); #endif char *mkmodestr(unsigned long mode, char *str); |