resolve conflict in zstd_internal.h

2016-03-04 20:04:25 +01:00 · 2016-03-04 20:04:25 +01:00 · f3c6503e55
commit f3c6503e55
parent e29caf7d1c
1 changed files with 2 additions and 1 deletions
--- a/lib/zstd_internal.h
+++ b/lib/zstd_internal.h
@ -105,12 +105,13 @@ static const size_t ZSTD_frameHeaderSize_min = 5;
 #define OffFSELog   9
 #define MaxSeq MAX(MaxLL, MaxML)

+#define LONGNBSEQ 0xFF00
+
 #define FSE_ENCODING_RAW     0
 #define FSE_ENCODING_RLE     1
 #define FSE_ENCODING_STATIC  2
 #define FSE_ENCODING_DYNAMIC 3

-
 #define HufLog 12

 #define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */