Merge remote-tracking branch 'refs/remotes/Cyan4973/dev060' into repcodes

# Conflicts: # lib/zstd_decompress.c # programs/bench.c
2016-03-18 11:14:58 +01:00
parent eca2ec0b3b 1d1ae40258
commit 5b15865413
19 changed files with 721 additions and 633 deletions
@@ -30,7 +30,7 @@ int BMK_benchFiles(const char** fileNamesTable, unsigned nbFiles,
                   const char* dictFileName, int cLevel, int cLevelLast, int additionalParam);

 /* Set Parameters */
-void BMK_SetNbIterations(int nbLoops);
+void BMK_SetNbIterations(unsigned nbLoops);
 void BMK_SetBlockSize(size_t blockSize);
 void BMK_setNotificationLevel(unsigned level);