From 3f1649fb0dfb1e5c8890de154c332c394db5cdb5 Mon Sep 17 00:00:00 2001
From: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
Date: Tue, 28 Jul 2009 09:33:17 +0200
Subject: [PATCH] Fix LZMA string.h header inclusion issue and remove unused
 variables.

Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
---
 lib_generic/lzma/LzmaDec.c   | 2 +-
 lib_generic/lzma/LzmaTools.c | 1 -
 lib_generic/lzma/Makefile    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib_generic/lzma/LzmaDec.c b/lib_generic/lzma/LzmaDec.c
index acffb14aae..f941da27dd 100644
--- 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 88ba399c7c..408b577f17 100644
--- 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 2916f215b0..57f03b0cd7 100644
--- 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
 
-- 
2.25.1