From: Sen Huang <senhuang96@fb.com>
Date: Mon, 21 Oct 2019 23:02:52 +0000 (-0400)
Subject: merge
X-Git-Tag: v1.4.4~1^2~15^2~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b2f4ac1a8bc4cd3f5a6568003a0e6e03e71270b;p=thirdparty%2Fzstd.git

merge
---

5b2f4ac1a8bc4cd3f5a6568003a0e6e03e71270b
diff --cc lib/compress/zstd_compress.c
index 73e6618c1,6113df4b2..202ca037f
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -3240,18 -3254,6 +3266,8 @@@ ZSTD_CDict* ZSTD_createCDict_advanced(c
          assert(cdict != NULL);
          ZSTD_cwksp_move(&cdict->workspace, &ws);
          cdict->customMem = customMem;
- <<<<<<< HEAD
- <<<<<<< HEAD
- =======
-         cdict->workspace = workspace;
-         cdict->workspaceSize = workspaceSize;
-         cdict->compressionLevel = 0; /* signals advanced API usage */
- 
- >>>>>>> Fix error
- =======
 +        cdict->compressionLevel = 0; /* signals advanced API usage */
 +
- >>>>>>> merge conflicts round 2
          if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
                                          dictBuffer, dictSize,
                                          dictLoadMethod, dictContentType,