resolve conflict in zstd_internal.h

diff --git a/lib/zstd_internal.h b/lib/zstd_internal.h
index e136a89cceb4f1af375c2d469777642a4f4cd41b..b06097a212776084c559903b0ea023c8932f9c67 100644 (file)
--- 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 */