summaryrefslogtreecommitdiffstats
path: root/Utilities/cmliblzma/liblzma/lz/lz_encoder.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-07-24 14:51:21 (GMT)
committerBrad King <brad.king@kitware.com>2014-07-29 12:45:36 (GMT)
commit73eab246fbfad22bcc1b0bb5599f8e0cffb79c0d (patch)
treed3358ae784286a14a0bafb60e6c413f7f204c4eb /Utilities/cmliblzma/liblzma/lz/lz_encoder.h
parent90e7a4d41f588d87415381fdb507735e6438992c (diff)
downloadCMake-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/lz/lz_encoder.h')
-rw-r--r--Utilities/cmliblzma/liblzma/lz/lz_encoder.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/cmliblzma/liblzma/lz/lz_encoder.h b/Utilities/cmliblzma/liblzma/lz/lz_encoder.h
index 647f5e2..dcb4b2c 100644
--- a/Utilities/cmliblzma/liblzma/lz/lz_encoder.h
+++ b/Utilities/cmliblzma/liblzma/lz/lz_encoder.h
@@ -194,9 +194,9 @@ typedef struct {
lzma_coder *coder;
/// Function to encode from *dict to out[]
- lzma_ret (*code)(lzma_coder *restrict coder,
- lzma_mf *restrict mf, uint8_t *restrict out,
- size_t *restrict out_pos, size_t out_size);
+ lzma_ret (*code)(lzma_coder *LZMA_RESTRICT coder,
+ lzma_mf *LZMA_RESTRICT mf, uint8_t *LZMA_RESTRICT out,
+ size_t *LZMA_RESTRICT out_pos, size_t out_size);
/// Free allocated resources
void (*end)(lzma_coder *coder, lzma_allocator *allocator);