From: Sen Huang <senhuang96@fb.com>
Date: Tue, 15 Oct 2019 17:10:05 +0000 (-0400)
Subject: merge conflicts round 2
X-Git-Tag: v1.4.4~1^2~15^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c010c9d2d9c78622fff02c539159c94d185347b;p=thirdparty%2Fzstd.git

merge conflicts round 2
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index c6ab40ecd..adf0ccab7 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -2917,7 +2917,7 @@ static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
     {   size_t const dictID = cdict ? 
                 ZSTD_compress_insertDictionary(
                         cctx->blockState.prevCBlock, &cctx->blockState.matchState,
-                        &params, cdict->dictContent, cdict->dictContentSize,
+                        &cctx->workspace, params, cdict->dictContent, cdict->dictContentSize,
                         dictContentType, dtlm, cctx->entropyWorkspace)
               : ZSTD_compress_insertDictionary(
                         cctx->blockState.prevCBlock, &cctx->blockState.matchState,
@@ -3237,13 +3237,8 @@ ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize,
         assert(cdict != NULL);
         ZSTD_cwksp_move(&cdict->workspace, &ws);
         cdict->customMem = customMem;
-<<<<<<< HEAD
-        cdict->workspace = workspace;
-        cdict->workspaceSize = workspaceSize;
         cdict->compressionLevel = 0; /* signals advanced API usage */
 
-=======
->>>>>>> 8b6d96827c24dd09109830272f413254833317d9
         if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
                                         dictBuffer, dictSize,
                                         dictLoadMethod, dictContentType,