diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-29 14:14:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-29 14:14:03 (GMT) |
| commit | 60212979ea6cf92be7557358ef89484317ae0340 (patch) | |
| tree | c7e20856647759c64e7dcaf1d3a836bcbbe8df9a /Utilities/cmliblzma/liblzma/api | |
| parent | d4f524040e8b9573bd568e4bb6b6ddb70d6ab366 (diff) | |
| parent | e4d3914639d1e7b41337c9626b91458c4fe6ae95 (diff) | |
| download | CMake-60212979ea6cf92be7557358ef89484317ae0340.zip CMake-60212979ea6cf92be7557358ef89484317ae0340.tar.gz CMake-60212979ea6cf92be7557358ef89484317ae0340.tar.bz2 | |
Merge branch 'upstream-liblzma' into update-liblzma
* upstream-liblzma:
liblzma 2014-12-21 (265e5ffb)
Diffstat (limited to 'Utilities/cmliblzma/liblzma/api')
| -rw-r--r-- | Utilities/cmliblzma/liblzma/api/lzma/block.h | 3 | ||||
| -rw-r--r-- | Utilities/cmliblzma/liblzma/api/lzma/version.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Utilities/cmliblzma/liblzma/api/lzma/block.h b/Utilities/cmliblzma/liblzma/api/lzma/block.h index 8a4bf23..e6710a7 100644 --- a/Utilities/cmliblzma/liblzma/api/lzma/block.h +++ b/Utilities/cmliblzma/liblzma/api/lzma/block.h @@ -318,6 +318,9 @@ extern LZMA_API(lzma_ret) lzma_block_header_encode( * The size of the Block Header must have already been decoded with * lzma_block_header_size_decode() macro and stored to block->header_size. * + * The integrity check type from Stream Header must have been stored + * to block->check. + * * block->filters must have been allocated, but they don't need to be * initialized (possible existing filter options are not freed). * diff --git a/Utilities/cmliblzma/liblzma/api/lzma/version.h b/Utilities/cmliblzma/liblzma/api/lzma/version.h index 66e9396..09866b9 100644 --- a/Utilities/cmliblzma/liblzma/api/lzma/version.h +++ b/Utilities/cmliblzma/liblzma/api/lzma/version.h @@ -22,7 +22,7 @@ */ #define LZMA_VERSION_MAJOR 5 #define LZMA_VERSION_MINOR 0 -#define LZMA_VERSION_PATCH 5 +#define LZMA_VERSION_PATCH 8 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE #ifndef LZMA_VERSION_COMMIT |