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/config.h.in | |
| 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/config.h.in')
| -rw-r--r-- | Utilities/cmliblzma/config.h.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Utilities/cmliblzma/config.h.in b/Utilities/cmliblzma/config.h.in index 391bb87..b197f27 100644 --- a/Utilities/cmliblzma/config.h.in +++ b/Utilities/cmliblzma/config.h.in @@ -188,10 +188,12 @@ typedef uint64_t uintmax_t; #ifndef HAVE_RESTRICT # ifdef HAVE___RESTRICT -# define restrict __restrict +# define LZMA_RESTRICT __restrict # else -# define restrict +# define LZMA_RESTRICT # endif +#else +# define LZMA_RESTRICT restrict #endif /* HAVE_RESTRICT */ #ifndef HAVE_INLINE |