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

Signed-off-by: Luigi 'Comio' Mantellini <[email protected]>

diff --git a/lib_generic/lzma/LzmaDec.c b/lib_generic/lzma/LzmaDec.c
index acffb14aaeeec9ad808f3a94889aab9a68895de9..f941da27dd0bdad1c78e2ed77825797a29f8bfd4 100644 (file)
--- 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)

diff --git a/lib_generic/lzma/LzmaTools.c b/lib_generic/lzma/LzmaTools.c
index 88ba399c7caee4964f5f5d77e09582044723d082..408b577f17a387a6434a843de73793a15102df86 100644 (file)
--- 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;

diff --git a/lib_generic/lzma/Makefile b/lib_generic/lzma/Makefile
index 2916f215b03f5f1dd4dca3a5f135ec36ab4e30c5..57f03b0cd784637dc95fa252054fa477736b3943 100644 (file)
--- 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