summaryrefslogtreecommitdiffstats
path: root/Utilities/cmliblzma/liblzma/simple/arm.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-08-06 14:24:55 (GMT)
committerBrad King <brad.king@kitware.com>2018-08-06 14:24:55 (GMT)
commit7a976ee74237ad916396ba95a84e6842d79c395c (patch)
tree36b3eddd0d844fbd828959c1f3728e2ceb621286 /Utilities/cmliblzma/liblzma/simple/arm.c
parent021b54cab8cf52a2ac93e80fbb30a98ed6d5e9f7 (diff)
parent352b8fa70d18ff1664cd8b22f42cf980a976ae4d (diff)
downloadCMake-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/simple/arm.c')
-rw-r--r--Utilities/cmliblzma/liblzma/simple/arm.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/Utilities/cmliblzma/liblzma/simple/arm.c b/Utilities/cmliblzma/liblzma/simple/arm.c
index a84702a..181d0e3 100644
--- a/Utilities/cmliblzma/liblzma/simple/arm.c
+++ b/Utilities/cmliblzma/liblzma/simple/arm.c
@@ -15,7 +15,7 @@
static size_t
-arm_code(lzma_simple *simple lzma_attribute((__unused__)),
+arm_code(void *simple lzma_attribute((__unused__)),
uint32_t now_pos, bool is_encoder,
uint8_t *buffer, size_t size)
{
@@ -45,7 +45,7 @@ arm_code(lzma_simple *simple lzma_attribute((__unused__)),
static lzma_ret
-arm_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
+arm_coder_init(lzma_next_coder *next, const lzma_allocator *allocator,
const lzma_filter_info *filters, bool is_encoder)
{
return lzma_simple_coder_init(next, allocator, filters,
@@ -54,7 +54,8 @@ arm_coder_init(lzma_next_coder *next, lzma_allocator *allocator,
extern lzma_ret
-lzma_simple_arm_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
+lzma_simple_arm_encoder_init(lzma_next_coder *next,
+ const lzma_allocator *allocator,
const lzma_filter_info *filters)
{
return arm_coder_init(next, allocator, filters, true);
@@ -62,7 +63,8 @@ lzma_simple_arm_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
extern lzma_ret
-lzma_simple_arm_decoder_init(lzma_next_coder *next, lzma_allocator *allocator,
+lzma_simple_arm_decoder_init(lzma_next_coder *next,
+ const lzma_allocator *allocator,
const lzma_filter_info *filters)
{
return arm_coder_init(next, allocator, filters, false);