Changeset 19107


Ignore:
Timestamp:
2010-01-11T17:15:52+01:00 (8 years ago)
Author:
lars
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch

    r19104 r19107  
    1616--- a/mkfs.ubifs/compr.c 
    1717+++ b/mkfs.ubifs/compr.c 
    18 @@ -83,6 +83,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, 
     18@@ -25,7 +25,9 @@ 
     19 #include <stdint.h> 
     20 #include <string.h> 
     21 #include <zlib.h> 
     22+#if CONFIG_UBIFS_LZO 
     23 #include <lzo/lzo1x.h> 
     24+#endif 
     25 #include <linux/types.h> 
     26  
     27 #include "compr.h" 
     28@@ -83,6 +85,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, 
    1929        return 0; 
    2030 } 
     
    3444                        size_t *out_len) 
    3545 { 
    36 @@ -101,14 +112,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, 
     46@@ -101,14 +114,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, 
    3747        return 0; 
    3848 } 
     
    5666  
    5767 static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf, 
    58 @@ -195,9 +208,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len, 
     68@@ -195,9 +210,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len, 
    5969  
    6070 int init_compression(void) 
     
    6878        zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR); 
    6979        if (!zlib_buf) { 
    70 @@ -211,7 +226,9 @@ int init_compression(void) 
     80@@ -211,7 +228,9 @@ int init_compression(void) 
    7181 void destroy_compression(void) 
    7282 { 
Note: See TracChangeset for help on using the changeset viewer.