KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mtd-utils: Don't include lzo headers aswell...

Browse source 
SVN-Revision: 19107
This commit is contained in:
Lars-Peter Clausen 2010-01-11 16:15:52 +00:00
parent bcdfe67a13
commit 46efcd60eb
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
View file

@ -15,7 +15,17 @@ diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
index e378c5d..0208f80 100644 index e378c5d..0208f80 100644
--- a/mkfs.ubifs/compr.c --- a/mkfs.ubifs/compr.c
+++ b/mkfs.ubifs/compr.c +++ b/mkfs.ubifs/compr.c
@@ -83,6 +83,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, @@ -25,7 +25,9 @@
#include <stdint.h>
#include <string.h>
#include <zlib.h>
+#if CONFIG_UBIFS_LZO
#include <lzo/lzo1x.h>
+#endif
#include <linux/types.h>
#include "compr.h"
@@ -83,6 +85,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf,
return 0; return 0;
} }
@ -33,7 +43,7 @@ index e378c5d..0208f80 100644
static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
size_t *out_len) size_t *out_len)
{ {
@@ -101,14 +112,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, @@ -101,14 +114,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
return 0; return 0;
} }
@ -55,7 +65,7 @@ index e378c5d..0208f80 100644
static char *zlib_buf; static char *zlib_buf;
static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf, static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf,
@@ -195,9 +208,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len, @@ -195,9 +210,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len,
int init_compression(void) int init_compression(void)
{ {
@ -67,7 +77,7 @@ index e378c5d..0208f80 100644
zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR); zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR);
if (!zlib_buf) { if (!zlib_buf) {
@@ -211,7 +226,9 @@ int init_compression(void) @@ -211,7 +228,9 @@ int init_compression(void)
void destroy_compression(void) void destroy_compression(void)
{ {
free(zlib_buf); free(zlib_buf);