Merge pull request #69 from Cyan4973/dev

Fixed : Visual compilation
This commit is contained in:
Yann Collet 2015-03-31 15:11:11 +02:00
commit 160661c7a4
3 changed files with 9 additions and 3 deletions

View File

@ -1088,8 +1088,10 @@ size_t LZ4F_decompress(LZ4F_decompressionContext_t decompressionContext,
doAnotherStage = 0; /* not enough src data, ask for some more */ doAnotherStage = 0; /* not enough src data, ask for some more */
break; break;
} }
{
LZ4F_errorCode_t errorCode = LZ4F_decodeHeader(dctxPtr, dctxPtr->header, dctxPtr->tmpInTarget); LZ4F_errorCode_t errorCode = LZ4F_decodeHeader(dctxPtr, dctxPtr->header, dctxPtr->tmpInTarget);
if (LZ4F_isError(errorCode)) return errorCode; if (LZ4F_isError(errorCode)) return errorCode;
}
break; break;
} }

View File

@ -607,7 +607,7 @@ int fuzzerTests(U32 seed, unsigned nbTests, unsigned startTest, double compressi
/* create a skippable frame (rare case) */ /* create a skippable frame (rare case) */
BYTE* op = (BYTE*)compressedBuffer; BYTE* op = (BYTE*)compressedBuffer;
FUZ_writeLE32(op, LZ4F_MAGIC_SKIPPABLE_START + (FUZ_rand(&randState) & 15)); FUZ_writeLE32(op, LZ4F_MAGIC_SKIPPABLE_START + (FUZ_rand(&randState) & 15));
FUZ_writeLE32(op+4, srcSize); FUZ_writeLE32(op+4, (U32)srcSize);
cSize = srcSize+8; cSize = srcSize+8;
} }
else if ((FUZ_rand(&randState) & 0xF) == 2) else if ((FUZ_rand(&randState) & 0xF) == 2)

View File

@ -75,6 +75,10 @@
# define SET_SPARSE_FILE_MODE(file) # define SET_SPARSE_FILE_MODE(file)
#endif #endif
#if !defined(S_ISREG)
# define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
#endif
/***************************** /*****************************
* Constants * Constants