ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into longOffsetMode

Browse Source
This commit is contained in:
Yann Collet
2018-03-05 13:10:10 -08:00
parent cb789d2df8 99afe72576
commit 41bd10446e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/common/compiler.h
+5 -2
View File
@@ -74,8 +74,11 @@
* Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default. * Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default.
*/ */
#ifndef DYNAMIC_BMI2 #ifndef DYNAMIC_BMI2
#if defined(__GNUC__) && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) \ #if defined(__clang__) \
&& (defined(__x86_64__) || defined(_M_X86)) && !defined(__BMI2__) || (defined(__GNUC__) \
&& (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) \
&& (defined(__x86_64__) || defined(_M_X86)) \
&& !defined(__BMI2__)
# define DYNAMIC_BMI2 1 # define DYNAMIC_BMI2 1
#else #else
# define DYNAMIC_BMI2 0 # define DYNAMIC_BMI2 0
programs/fileio.c
+1
View File
@@ -1963,6 +1963,7 @@ static void displayInfo(const char* inFileName, const fileInfo_t* info, int disp
static fileInfo_t FIO_addFInfo(fileInfo_t fi1, fileInfo_t fi2) static fileInfo_t FIO_addFInfo(fileInfo_t fi1, fileInfo_t fi2)
{ {
fileInfo_t total; fileInfo_t total;
memset(&total, 0, sizeof(total));
total.numActualFrames = fi1.numActualFrames + fi2.numActualFrames; total.numActualFrames = fi1.numActualFrames + fi2.numActualFrames;
total.numSkippableFrames = fi1.numSkippableFrames + fi2.numSkippableFrames; total.numSkippableFrames = fi1.numSkippableFrames + fi2.numSkippableFrames;
total.compressedSize = fi1.compressedSize + fi2.compressedSize; total.compressedSize = fi1.compressedSize + fi2.compressedSize;