From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 10 Nov 2013 19:37:01 +0000 (+0100)
Subject: 	* include/grub/lib/LzmaDec.h: Fix to include LzmaTypes.h and
X-Git-Tag: grub-2.02-beta1~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3617c59bab30133882daf6d7b47ca4dfb67f84d3;p=thirdparty%2Fgrub.git

	* include/grub/lib/LzmaDec.h: Fix to include LzmaTypes.h and
	not Types.h.
	* grub-core/lib/LzmaDec.c: Fix prologue to make it compileable in GRUB
	environment.
	(LzmaDec_InitDicAndState): Make static.
---

diff --git a/ChangeLog b/ChangeLog
index 04547ed03..394464900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/lib/LzmaDec.h: Fix to include LzmaTypes.h and
+	not Types.h.
+	* grub-core/lib/LzmaDec.c: Fix prologue to make it compileable in GRUB
+	environment.
+	(LzmaDec_InitDicAndState): Make static.
+
 2013-11-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkimagexx.c (generate_elf): Fix module address on coreboot.
diff --git a/grub-core/lib/LzmaDec.c b/grub-core/lib/LzmaDec.c
index 62ebee686..952edb346 100644
--- a/grub-core/lib/LzmaDec.c
+++ b/grub-core/lib/LzmaDec.c
@@ -26,7 +26,9 @@
 
 #include <grub/lib/LzmaDec.h>
 
-#include <string.h>
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <grub/misc.h>
+#define memcpy grub_memcpy
 
 #define kNumTopBits 24
 #define kTopValue ((UInt32)1 << kNumTopBits)
@@ -718,7 +720,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
   p->needFlush = 0;
 }
 
-void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
+static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
 {
   p->needFlush = 1;
   p->remainLen = 0;
diff --git a/include/grub/lib/LzmaDec.h b/include/grub/lib/LzmaDec.h
index 1e66b74d7..16914c961 100644
--- a/include/grub/lib/LzmaDec.h
+++ b/include/grub/lib/LzmaDec.h
@@ -27,7 +27,7 @@
 #ifndef __LZMADEC_H
 #define __LZMADEC_H
 
-#include "Types.h"
+#include "LzmaTypes.h"
 
 /* #define _LZMA_PROB32 */
 /* _LZMA_PROB32 can increase the speed on some CPUs,