diff options
author | DLL125 <134442578+DLL125@users.noreply.github.com> | 2023-06-23 21:19:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-23 21:19:50 +0200 |
commit | 097cfa947e068bcfc439cd466e53361d7f6d1b46 (patch) | |
tree | 83b0399b71529b2847c78ae20d45b100651a9cbc /src/Common/lzma/LzmaDec.h | |
parent | 9e1c0e5b22e6b668440c7e738cbd6cd9f651ddef (diff) | |
download | VeraCrypt-097cfa947e068bcfc439cd466e53361d7f6d1b46.tar.gz VeraCrypt-097cfa947e068bcfc439cd466e53361d7f6d1b46.zip |
Dll125 lzma (#1120)
* Update LZMA to latest
* Add missing file
Diffstat (limited to 'src/Common/lzma/LzmaDec.h')
-rw-r--r-- | src/Common/lzma/LzmaDec.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Common/lzma/LzmaDec.h b/src/Common/lzma/LzmaDec.h index 6f129625..b0ce28fa 100644 --- a/src/Common/lzma/LzmaDec.h +++ b/src/Common/lzma/LzmaDec.h @@ -1,19 +1,19 @@ /* LzmaDec.h -- LZMA Decoder -2020-03-19 : Igor Pavlov : Public domain */ +2023-04-02 : Igor Pavlov : Public domain */ -#ifndef __LZMA_DEC_H -#define __LZMA_DEC_H +#ifndef ZIP7_INC_LZMA_DEC_H +#define ZIP7_INC_LZMA_DEC_H #include "7zTypes.h" EXTERN_C_BEGIN -/* #define _LZMA_PROB32 */ -/* _LZMA_PROB32 can increase the speed on some CPUs, +/* #define Z7_LZMA_PROB32 */ +/* Z7_LZMA_PROB32 can increase the speed on some CPUs, but memory usage for CLzmaDec::probs will be doubled in that case */ typedef -#ifdef _LZMA_PROB32 +#ifdef Z7_LZMA_PROB32 UInt32 #else UInt16 @@ -25,7 +25,7 @@ typedef #define LZMA_PROPS_SIZE 5 -typedef struct _CLzmaProps +typedef struct { Byte lc; Byte lp; @@ -73,7 +73,8 @@ typedef struct Byte tempBuf[LZMA_REQUIRED_INPUT_MAX]; } CLzmaDec; -#define LzmaDec_Construct(p) { (p)->dic = NULL; (p)->probs = NULL; } +#define LzmaDec_CONSTRUCT(p) { (p)->dic = NULL; (p)->probs = NULL; } +#define LzmaDec_Construct(p) LzmaDec_CONSTRUCT(p) void LzmaDec_Init(CLzmaDec *p); |