Fix a number of MSVC warnings

Fixes a number of warnings with all modules
This commit is contained in:
jp9000
2017-12-05 13:53:18 -08:00
parent ffdecc34f4
commit 0d6204c8af
19 changed files with 185 additions and 101 deletions

View File

@@ -31,6 +31,8 @@ add_definitions(
if(WIN32)
if(MSVC)
add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
add_compile_options("/wd4244")
add_compile_options("/wd4267")
endif()
add_definitions(
-Dinline=_inline

View File

@@ -565,7 +565,8 @@ extern LZMA_API(lzma_bool) lzma_index_iter_locate(
* - LZMA_PROG_ERROR
*/
extern LZMA_API(lzma_ret) lzma_index_cat(
lzma_index *dest, lzma_index *src, lzma_allocator *allocator)
lzma_index *restrict dest, lzma_index *restrict src,
lzma_allocator *allocator)
lzma_nothrow lzma_attr_warn_unused_result;

View File

@@ -113,7 +113,8 @@ typedef uint64_t lzma_vli;
* - LZMA_PROG_ERROR: Arguments are not sane.
*/
extern LZMA_API(lzma_ret) lzma_vli_encode(lzma_vli vli, size_t *vli_pos,
uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow;
uint8_t *restrict out, size_t *restrict out_pos,
size_t out_size) lzma_nothrow;
/**
@@ -151,8 +152,9 @@ extern LZMA_API(lzma_ret) lzma_vli_encode(lzma_vli vli, size_t *vli_pos,
* - LZMA_BUF_ERROR: No input was provided.
* - LZMA_PROG_ERROR: Arguments are not sane.
*/
extern LZMA_API(lzma_ret) lzma_vli_decode(lzma_vli *vli, size_t *vli_pos,
const uint8_t *in, size_t *in_pos, size_t in_size)
extern LZMA_API(lzma_ret) lzma_vli_decode(lzma_vli *restrict vli,
size_t *vli_pos, const uint8_t *restrict in,
size_t *restrict in_pos, size_t in_size)
lzma_nothrow;