diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-06 14:24:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-06 14:24:55 (GMT) |
| commit | 7a976ee74237ad916396ba95a84e6842d79c395c (patch) | |
| tree | 36b3eddd0d844fbd828959c1f3728e2ceb621286 /Utilities/cmliblzma/liblzma/lzma/lzma_decoder.h | |
| parent | 021b54cab8cf52a2ac93e80fbb30a98ed6d5e9f7 (diff) | |
| parent | 352b8fa70d18ff1664cd8b22f42cf980a976ae4d (diff) | |
| download | CMake-7a976ee74237ad916396ba95a84e6842d79c395c.zip CMake-7a976ee74237ad916396ba95a84e6842d79c395c.tar.gz CMake-7a976ee74237ad916396ba95a84e6842d79c395c.tar.bz2 | |
Merge branch 'upstream-liblzma' into update-liblzma
* upstream-liblzma:
liblzma 2018-04-29 (b5be61cc)
Diffstat (limited to 'Utilities/cmliblzma/liblzma/lzma/lzma_decoder.h')
| -rw-r--r-- | Utilities/cmliblzma/liblzma/lzma/lzma_decoder.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Utilities/cmliblzma/liblzma/lzma/lzma_decoder.h b/Utilities/cmliblzma/liblzma/lzma/lzma_decoder.h index a463a76..fa8ecb2 100644 --- a/Utilities/cmliblzma/liblzma/lzma/lzma_decoder.h +++ b/Utilities/cmliblzma/liblzma/lzma/lzma_decoder.h @@ -19,12 +19,13 @@ /// Allocates and initializes LZMA decoder extern lzma_ret lzma_lzma_decoder_init(lzma_next_coder *next, - lzma_allocator *allocator, const lzma_filter_info *filters); + const lzma_allocator *allocator, + const lzma_filter_info *filters); extern uint64_t lzma_lzma_decoder_memusage(const void *options); extern lzma_ret lzma_lzma_props_decode( - void **options, lzma_allocator *allocator, + void **options, const lzma_allocator *allocator, const uint8_t *props, size_t props_size); @@ -40,7 +41,7 @@ extern bool lzma_lzma_lclppb_decode( /// Allocate and setup function pointers only. This is used by LZMA1 and /// LZMA2 decoders. extern lzma_ret lzma_lzma_decoder_create( - lzma_lz_decoder *lz, lzma_allocator *allocator, + lzma_lz_decoder *lz, const lzma_allocator *allocator, const void *opt, lzma_lz_options *lz_options); /// Gets memory usage without validating lc/lp/pb. This is used by LZMA2 |