From: inikep <inikep@gmail.com>
Date: Fri, 4 Mar 2016 19:04:25 +0000 (+0100)
Subject: resolve conflict in zstd_internal.h
X-Git-Tag: v0.6.0^2~17^2~86^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3c6503e5517a855f065428eca44971c1a0dd482;p=thirdparty%2Fzstd.git

resolve conflict in zstd_internal.h
---

diff --git a/lib/zstd_internal.h b/lib/zstd_internal.h
index e136a89cc..b06097a21 100644
--- 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 */