diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-06 13:45:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-06 13:47:42 (GMT) |
| commit | 0a3912112d11514ba1652423e21a767507ce75fb (patch) | |
| tree | 91c973b47790ebeab1ceb91876aadb4f08c8557b /Utilities/cmliblzma/liblzma/lzma/lzma_encoder.c | |
| parent | d7a1bcd2e67e27d8897c100f14744547ef639d64 (diff) | |
| download | CMake-0a3912112d11514ba1652423e21a767507ce75fb.zip CMake-0a3912112d11514ba1652423e21a767507ce75fb.tar.gz CMake-0a3912112d11514ba1652423e21a767507ce75fb.tar.bz2 | |
liblzma: Revert "Avoid defining a 'restrict' macro"
Revert commit v3.1.0-rc1~255^2~2 (liblzma: Avoid defining a 'restrict'
macro, 2014-07-24). We will use another approach to deal with the
'restrict' keyword.
Diffstat (limited to 'Utilities/cmliblzma/liblzma/lzma/lzma_encoder.c')
| -rw-r--r-- | Utilities/cmliblzma/liblzma/lzma/lzma_encoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Utilities/cmliblzma/liblzma/lzma/lzma_encoder.c b/Utilities/cmliblzma/liblzma/lzma/lzma_encoder.c index e8738f4..6186f83 100644 --- a/Utilities/cmliblzma/liblzma/lzma/lzma_encoder.c +++ b/Utilities/cmliblzma/liblzma/lzma/lzma_encoder.c @@ -318,8 +318,8 @@ encode_eopm(lzma_coder *coder, uint32_t position) extern lzma_ret -lzma_lzma_encode(lzma_coder *LZMA_RESTRICT coder, lzma_mf *LZMA_RESTRICT mf, - uint8_t *LZMA_RESTRICT out, size_t *LZMA_RESTRICT out_pos, +lzma_lzma_encode(lzma_coder *restrict coder, lzma_mf *restrict mf, + uint8_t *restrict out, size_t *restrict out_pos, size_t out_size, uint32_t limit) { uint32_t position; @@ -414,8 +414,8 @@ lzma_lzma_encode(lzma_coder *LZMA_RESTRICT coder, lzma_mf *LZMA_RESTRICT mf, static lzma_ret -lzma_encode(lzma_coder *LZMA_RESTRICT coder, lzma_mf *LZMA_RESTRICT mf, - uint8_t *LZMA_RESTRICT out, size_t *LZMA_RESTRICT out_pos, +lzma_encode(lzma_coder *restrict coder, lzma_mf *restrict mf, + uint8_t *restrict out, size_t *restrict out_pos, size_t out_size) { // Plain LZMA has no support for sync-flushing. |