From: inikep <inikep@gmail.com>
Date: Tue, 24 May 2016 15:15:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev
X-Git-Tag: v0.7.0^2~54^2^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02c244bf789254783071abbe6b6c6fb178be1d74;p=thirdparty%2Fzstd.git

Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev
---

02c244bf789254783071abbe6b6c6fb178be1d74
diff --cc programs/zbufftest.c
index d7f7ac00d,c350fabb9..e9e54586c
--- a/programs/zbufftest.c
+++ b/programs/zbufftest.c
@@@ -153,11 -136,10 +149,10 @@@ static int basicUnitTests(U32 seed, dou
      void* compressedBuffer = malloc(compressedBufferSize);
      size_t const decodedBufferSize = CNBufferSize;
      void* decodedBuffer = malloc(decodedBufferSize);
-     U32 randState = seed;
      size_t result, cSize, readSize, genSize;
      U32 testNb=0;
 -    ZBUFF_CCtx* zc = ZBUFF_createCCtx();
 -    ZBUFF_DCtx* zd = ZBUFF_createDCtx();
 +    ZBUFF_CCtx* zc = ZBUFF_createCCtx_advanced(customMem);
 +    ZBUFF_DCtx* zd = ZBUFF_createDCtx_advanced(customMem);
  
      /* Create compressible test buffer */
      if (!CNBuffer || !compressedBuffer || !decodedBuffer || !zc || !zd) {