aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-01-11 16:15:52 +0000
committerLars-Peter Clausen <lars@metafoo.de>2010-01-11 16:15:52 +0000
commit46efcd60ebe4cddd14f846607dd450d5a2093b1f (patch)
treeb354c4b56d51efa1a3f6f2c188391b1e7b4cfded
parentbcdfe67a13a31c5d46543c3ae52ad52f6326d06d (diff)
downloadupstream-46efcd60ebe4cddd14f846607dd450d5a2093b1f.tar.gz
upstream-46efcd60ebe4cddd14f846607dd450d5a2093b1f.tar.bz2
upstream-46efcd60ebe4cddd14f846607dd450d5a2093b1f.zip
mtd-utils: Don't include lzo headers aswell...
SVN-Revision: 19107
-rw-r--r--tools/mtd-utils/patches/101-ubifs-optional_lzo.patch18
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
index 35a7cd86f5..d49c94bb28 100644
--- a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
+++ b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
@@ -15,7 +15,17 @@ diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
index e378c5d..0208f80 100644
--- a/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;
}
@@ -33,7 +43,7 @@ index e378c5d..0208f80 100644
static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
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;
}
@@ -55,7 +65,7 @@ index e378c5d..0208f80 100644
static char *zlib_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)
{
@@ -67,7 +77,7 @@ index e378c5d..0208f80 100644
zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR);
if (!zlib_buf) {
-@@ -211,7 +226,9 @@ int init_compression(void)
+@@ -211,7 +228,9 @@ int init_compression(void)
void destroy_compression(void)
{
free(zlib_buf);