vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.
This commit is contained in:
Vladimir Serbinenko 2013-11-10 20:37:01 +01:00
parent 881c6a1049
commit 3617c59bab
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2013-11-10 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimagexx.c (generate_elf): Fix module address on coreboot. * util/grub-mkimagexx.c (generate_elf): Fix module address on coreboot.

6
grub-core/lib/LzmaDec.c
View File

@ -26,7 +26,9 @@
#include <grub/lib/LzmaDec.h> #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 kNumTopBits 24
#define kTopValue ((UInt32)1 << kNumTopBits) #define kTopValue ((UInt32)1 << kNumTopBits)
@ -718,7 +720,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
p->needFlush = 0; 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->needFlush = 1;
p->remainLen = 0; p->remainLen = 0;

2
include/grub/lib/LzmaDec.h
View File

@ -27,7 +27,7 @@
#ifndef __LZMADEC_H #ifndef __LZMADEC_H
#define __LZMADEC_H #define __LZMADEC_H
#include "Types.h" #include "LzmaTypes.h"
/* #define _LZMA_PROB32 */ /* #define _LZMA_PROB32 */
/* _LZMA_PROB32 can increase the speed on some CPUs, /* _LZMA_PROB32 can increase the speed on some CPUs,