From f3c6503e5517a855f065428eca44971c1a0dd482 Mon Sep 17 00:00:00 2001
From: inikep <inikep@gmail.com>
Date: Fri, 4 Mar 2016 20:04:25 +0100
Subject: [PATCH] resolve conflict in zstd_internal.h

---
 lib/zstd_internal.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 */