ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-21 03:55:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #209 from joshuawarner32/master

Browse Source 
fix lzma build
This commit is contained in:
Joel Dice 2014-03-25 16:04:53 -06:00
commit 77c451193c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/avian/lzma-util.h
View File

@ -11,10 +11,10 @@
#ifndef LZMA_UTIL_H
#define LZMA_UTIL_H
#include "avian/lzma.h"
#include "C/Types.h"
#include <avian/lzma.h>
#include <C/Types.h>
#include <avian/system/system.h>
#include "avian/util/allocator.h"
#include <avian/util/allocator.h>
namespace vm {
@ -22,13 +22,13 @@ const unsigned Padding = 16;
class LzmaAllocator {
public:
LzmaAllocator(Allocator* a): a(a) {
LzmaAllocator(avian::util::Allocator* a): a(a) {
allocator.Alloc = allocate;
allocator.Free = free;
}
ISzAlloc allocator;
Allocator* a;
avian::util::Allocator* a;
static void* allocate(void* allocator, size_t size) {
uint8_t* p = static_cast<uint8_t*>

2
src/lzma-decode.cpp
View File

@ -29,7 +29,7 @@ read4(const uint8_t* in)
namespace vm {
uint8_t*
decodeLZMA(System* s, Allocator* a, uint8_t* in, unsigned inSize,
decodeLZMA(System* s, avian::util::Allocator* a, uint8_t* in, unsigned inSize,
unsigned* outSize)
{
const unsigned PropHeaderSize = 5;