diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2015-03-31 13:11:11 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2015-03-31 13:11:11 (GMT) |
| commit | 160661c7a4cbf805f4af74d2e3932a17a66e6ce7 (patch) | |
| tree | aab3ca7f5cd39661d53e3fbef70bdca0e5043cda | |
| parent | 003af7181b524a7bc5f6aaf9ac95b6f9a47cae57 (diff) | |
| parent | 8437a0e43aa5086ec2c23591909e118a85c3d8dd (diff) | |
| download | lz4-160661c7a4cbf805f4af74d2e3932a17a66e6ce7.zip lz4-160661c7a4cbf805f4af74d2e3932a17a66e6ce7.tar.gz lz4-160661c7a4cbf805f4af74d2e3932a17a66e6ce7.tar.bz2 | |
Merge pull request #69 from Cyan4973/devr128
Fixed : Visual compilation
| -rw-r--r-- | lib/lz4frame.c | 6 | ||||
| -rw-r--r-- | programs/frametest.c | 2 | ||||
| -rw-r--r-- | programs/lz4io.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/lz4frame.c b/lib/lz4frame.c index 5f69c95..474b196 100644 --- a/lib/lz4frame.c +++ b/lib/lz4frame.c @@ -1088,8 +1088,10 @@ size_t LZ4F_decompress(LZ4F_decompressionContext_t decompressionContext, doAnotherStage = 0; /* not enough src data, ask for some more */ break; } - LZ4F_errorCode_t errorCode = LZ4F_decodeHeader(dctxPtr, dctxPtr->header, dctxPtr->tmpInTarget); - if (LZ4F_isError(errorCode)) return errorCode; + { + LZ4F_errorCode_t errorCode = LZ4F_decodeHeader(dctxPtr, dctxPtr->header, dctxPtr->tmpInTarget); + if (LZ4F_isError(errorCode)) return errorCode; + } break; } diff --git a/programs/frametest.c b/programs/frametest.c index 96d5acb..4beee23 100644 --- a/programs/frametest.c +++ b/programs/frametest.c @@ -607,7 +607,7 @@ int fuzzerTests(U32 seed, unsigned nbTests, unsigned startTest, double compressi /* create a skippable frame (rare case) */ BYTE* op = (BYTE*)compressedBuffer; 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; } else if ((FUZ_rand(&randState) & 0xF) == 2) diff --git a/programs/lz4io.c b/programs/lz4io.c index 34d24bf..02e03c8 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -75,6 +75,10 @@ # define SET_SPARSE_FILE_MODE(file) #endif +#if !defined(S_ISREG) +# define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) +#endif + /***************************** * Constants |