diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-24 14:51:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-29 12:45:36 (GMT) |
| commit | 73eab246fbfad22bcc1b0bb5599f8e0cffb79c0d (patch) | |
| tree | d3358ae784286a14a0bafb60e6c413f7f204c4eb /Utilities/cmliblzma/liblzma/lzma/lzma_decoder.c | |
| parent | 90e7a4d41f588d87415381fdb507735e6438992c (diff) | |
| download | CMake-73eab246fbfad22bcc1b0bb5599f8e0cffb79c0d.zip CMake-73eab246fbfad22bcc1b0bb5599f8e0cffb79c0d.tar.gz CMake-73eab246fbfad22bcc1b0bb5599f8e0cffb79c0d.tar.bz2 | |
liblzma: Avoid defining a 'restrict' macro
Any "#define restrict ..." line may conflict with MSVC header files
that use "__declspec(restrict)". Define our own LZMA_RESTRICT macro
in "Utilities/cmliblzma/config.h.in" and transform liblzma code to
use it:
git grep -lE '\<restrict\>' Utilities/cmliblzma/liblzma |
xargs sed -i 's/\<restrict\>/LZMA_RESTRICT/g'
Diffstat (limited to 'Utilities/cmliblzma/liblzma/lzma/lzma_decoder.c')
| -rw-r--r-- | Utilities/cmliblzma/liblzma/lzma/lzma_decoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/cmliblzma/liblzma/lzma/lzma_decoder.c b/Utilities/cmliblzma/liblzma/lzma/lzma_decoder.c index 1bee2a9..3c0f393 100644 --- a/Utilities/cmliblzma/liblzma/lzma/lzma_decoder.c +++ b/Utilities/cmliblzma/liblzma/lzma/lzma_decoder.c @@ -281,9 +281,9 @@ struct lzma_coder_s { static lzma_ret -lzma_decode(lzma_coder *restrict coder, lzma_dict *restrict dictptr, - const uint8_t *restrict in, - size_t *restrict in_pos, size_t in_size) +lzma_decode(lzma_coder *LZMA_RESTRICT coder, lzma_dict *LZMA_RESTRICT dictptr, + const uint8_t *LZMA_RESTRICT in, + size_t *LZMA_RESTRICT in_pos, size_t in_size) { /////////////// // Variables // |