Fix LZMA string.h header inclusion issue and remove unused variables.

Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
15 years ago · 3f1649fb0d
parent 1c6232f1e2
commit 3f1649fb0d
3 changed files with 2 additions and 3 deletions
--- a/lib_generic/lzma/LzmaDec.c
+++ b/lib_generic/lzma/LzmaDec.c
@ -6,7 +6,7 @@
 #include <watchdog.h>
 #include "LzmaDec.h"

-#include <string.h>
+#include <linux/string.h>

 #define kNumTopBits 24
 #define kTopValue ((UInt32)1 << kNumTopBits)
--- a/lib_generic/lzma/LzmaTools.c
+++ b/lib_generic/lzma/LzmaTools.c
@ -61,7 +61,6 @@ int lzmaBuffToBuffDecompress (unsigned char *outStream, SizeT *uncompressedSize,
    ISzAlloc g_Alloc;

    SizeT outSizeFull = 0xFFFFFFFF; /* 4GBytes limit */
-    SizeT inProcessed;
    SizeT outProcessed;
    SizeT outSize;
    SizeT outSizeHigh;
--- a/lib_generic/lzma/Makefile
+++ b/lib_generic/lzma/Makefile
@ -30,7 +30,7 @@ LIB	= $(obj)liblzma.a

 SOBJS	=

-CFLAGS += -D_LZMA_PROB32 -I$(TOPDIR)/include/linux
+CFLAGS += -D_LZMA_PROB32

 COBJS-$(CONFIG_LZMA) += LzmaDec.o LzmaTools.o