ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflict in zstd_internal.h

Browse Source
This commit is contained in:
inikep
2016-03-04 20:04:25 +01:00
parent e29caf7d1c
commit f3c6503e55
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zstd_internal.h
+2 -1
View File
@@ -105,12 +105,13 @@ static const size_t ZSTD_frameHeaderSize_min = 5;
#define OffFSELog 9 #define OffFSELog 9
#define MaxSeq MAX(MaxLL, MaxML) #define MaxSeq MAX(MaxLL, MaxML)
#define LONGNBSEQ 0xFF00
#define FSE_ENCODING_RAW 0 #define FSE_ENCODING_RAW 0
#define FSE_ENCODING_RLE 1 #define FSE_ENCODING_RLE 1
#define FSE_ENCODING_STATIC 2 #define FSE_ENCODING_STATIC 2
#define FSE_ENCODING_DYNAMIC 3 #define FSE_ENCODING_DYNAMIC 3
#define HufLog 12 #define HufLog 12
#define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */ #define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */