From 22a0c6dd940b78cdac2f4a4b4b0e7cc0ac15021f Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Mon, 2 Feb 2009 20:14:03 +0200 Subject: Modify LZMA_API macro so that it works on Windows with other compilers than MinGW. This may hurt readability of the API headers slightly, but I don't know any better way to do this. --- src/liblzma/api/lzma/container.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/liblzma/api/lzma/container.h') diff --git a/src/liblzma/api/lzma/container.h b/src/liblzma/api/lzma/container.h index dc7dc855..b7a6128e 100644 --- a/src/liblzma/api/lzma/container.h +++ b/src/liblzma/api/lzma/container.h @@ -71,7 +71,7 @@ * * \param preset Compression preset (level and possible flags) */ -extern LZMA_API uint64_t lzma_easy_encoder_memusage(uint32_t preset) +extern LZMA_API(uint64_t) lzma_easy_encoder_memusage(uint32_t preset) lzma_attr_pure; @@ -82,7 +82,7 @@ extern LZMA_API uint64_t lzma_easy_encoder_memusage(uint32_t preset) * * \param preset Compression preset (level and possible flags) */ -extern LZMA_API uint64_t lzma_easy_decoder_memusage(uint32_t preset) +extern LZMA_API(uint64_t) lzma_easy_decoder_memusage(uint32_t preset) lzma_attr_pure; @@ -119,7 +119,7 @@ extern LZMA_API uint64_t lzma_easy_decoder_memusage(uint32_t preset) * LZMA_RUN, LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, and LZMA_FINISH. In future, * there may be compression levels or flags that don't support LZMA_SYNC_FLUSH. */ -extern LZMA_API lzma_ret lzma_easy_encoder( +extern LZMA_API(lzma_ret) lzma_easy_encoder( lzma_stream *strm, uint32_t preset, lzma_check check) lzma_attr_warn_unused_result; @@ -139,7 +139,7 @@ extern LZMA_API lzma_ret lzma_easy_encoder( * - LZMA_OPTIONS_ERROR * - LZMA_PROG_ERROR */ -extern LZMA_API lzma_ret lzma_stream_encoder(lzma_stream *strm, +extern LZMA_API(lzma_ret) lzma_stream_encoder(lzma_stream *strm, const lzma_filter *filters, lzma_check check) lzma_attr_warn_unused_result; @@ -164,7 +164,7 @@ extern LZMA_API lzma_ret lzma_stream_encoder(lzma_stream *strm, * - LZMA_OPTIONS_ERROR * - LZMA_PROG_ERROR */ -extern LZMA_API lzma_ret lzma_alone_encoder( +extern LZMA_API(lzma_ret) lzma_alone_encoder( lzma_stream *strm, const lzma_options_lzma *options) lzma_attr_warn_unused_result; @@ -191,7 +191,7 @@ extern LZMA_API lzma_ret lzma_alone_encoder( * uncompressible data. Currently there is no function to * calculate the maximum expansion of multi-call encoding. */ -extern LZMA_API size_t lzma_stream_buffer_bound(size_t uncompressed_size); +extern LZMA_API(size_t) lzma_stream_buffer_bound(size_t uncompressed_size); /** @@ -219,7 +219,7 @@ extern LZMA_API size_t lzma_stream_buffer_bound(size_t uncompressed_size); * - LZMA_DATA_ERROR * - LZMA_PROG_ERROR */ -extern LZMA_API lzma_ret lzma_stream_buffer_encode( +extern LZMA_API(lzma_ret) lzma_stream_buffer_encode( lzma_filter *filters, lzma_check check, lzma_allocator *allocator, const uint8_t *in, size_t in_size, uint8_t *out, size_t *out_pos, size_t out_size) @@ -286,7 +286,7 @@ extern LZMA_API lzma_ret lzma_stream_buffer_encode( * - LZMA_MEM_ERROR: Cannot allocate memory. * - LZMA_OPTIONS_ERROR: Unsupported flags */ -extern LZMA_API lzma_ret lzma_stream_decoder( +extern LZMA_API(lzma_ret) lzma_stream_decoder( lzma_stream *strm, uint64_t memlimit, uint32_t flags) lzma_attr_warn_unused_result; @@ -306,7 +306,7 @@ extern LZMA_API lzma_ret lzma_stream_decoder( * - LZMA_MEM_ERROR: Cannot allocate memory. * - LZMA_OPTIONS_ERROR: Unsupported flags */ -extern LZMA_API lzma_ret lzma_auto_decoder( +extern LZMA_API(lzma_ret) lzma_auto_decoder( lzma_stream *strm, uint64_t memlimit, uint32_t flags) lzma_attr_warn_unused_result; @@ -321,7 +321,7 @@ extern LZMA_API lzma_ret lzma_auto_decoder( * \return - LZMA_OK * - LZMA_MEM_ERROR */ -extern LZMA_API lzma_ret lzma_alone_decoder( +extern LZMA_API(lzma_ret) lzma_alone_decoder( lzma_stream *strm, uint64_t memlimit) lzma_attr_warn_unused_result; @@ -364,7 +364,7 @@ extern LZMA_API lzma_ret lzma_alone_decoder( * - LZMA_BUF_ERROR: Output buffer was too small. * - LZMA_PROG_ERROR */ -extern LZMA_API lzma_ret lzma_stream_buffer_decode( +extern LZMA_API(lzma_ret) lzma_stream_buffer_decode( uint64_t *memlimit, uint32_t flags, lzma_allocator *allocator, const uint8_t *in, size_t *in_pos, size_t in_size, uint8_t *out, size_t *out_pos, size_t out_size) -- cgit v1.2.3