diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-06 14:15:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-06 14:25:46 (GMT) |
| commit | 9f77124ea8ab7598a90a5d1271738b0a077d15c6 (patch) | |
| tree | 591f1d711c44a3bebd6f196910d116495fcb17e9 /Utilities/cmliblzma | |
| parent | 7a976ee74237ad916396ba95a84e6842d79c395c (diff) | |
| download | CMake-9f77124ea8ab7598a90a5d1271738b0a077d15c6.zip CMake-9f77124ea8ab7598a90a5d1271738b0a077d15c6.tar.gz CMake-9f77124ea8ab7598a90a5d1271738b0a077d15c6.tar.bz2 | |
liblzma: Drop checks for inline and restrict keywords
We now require the compiler to support these, except for MSVC where
upstream liblzma already has special cases (in `common/sysdefs.h`).
Diffstat (limited to 'Utilities/cmliblzma')
| -rw-r--r-- | Utilities/cmliblzma/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | Utilities/cmliblzma/config.h.in | 24 |
2 files changed, 0 insertions, 40 deletions
diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt index 17cbaf5..e9f8826 100644 --- a/Utilities/cmliblzma/CMakeLists.txt +++ b/Utilities/cmliblzma/CMakeLists.txt @@ -6,22 +6,6 @@ include(CheckSymbolExists) include(CheckTypeSize) include(TestBigEndian) -CHECK_C_SOURCE_COMPILES( - "int test (void *restrict x);\nint main (void) {return 0;}" - HAVE_RESTRICT) - -CHECK_C_SOURCE_COMPILES( -"typedef struct abc *d;\nint test (d __restrict x);\nint main (void) {return 0;}" - HAVE___RESTRICT) - -CHECK_C_SOURCE_COMPILES( - "static inline int test (void) {return 0;}\nint main (void) {return test();}" - HAVE_INLINE) - -CHECK_C_SOURCE_COMPILES ( - "static __inline int test (void) {return 0;}\nint main (void) {return test();}" - HAVE___INLINE) - CHECK_INCLUDE_FILE(byteswap.h HAVE_BYTESWAP_H) CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H) CHECK_INCLUDE_FILE(limits.h HAVE_LIMITS_H) diff --git a/Utilities/cmliblzma/config.h.in b/Utilities/cmliblzma/config.h.in index 84328a3..06f7fcb 100644 --- a/Utilities/cmliblzma/config.h.in +++ b/Utilities/cmliblzma/config.h.in @@ -180,30 +180,6 @@ typedef uint64_t uintmax_t; #cmakedefine uintptr_t @uintptr_t@ - -#cmakedefine HAVE_RESTRICT -#cmakedefine HAVE___RESTRICT - -#cmakedefine HAVE_INLINE -#cmakedefine HAVE___INLINE - -#ifndef HAVE_RESTRICT -# ifdef HAVE___RESTRICT -# define restrict __restrict -# else -# define restrict -# endif -#endif /* HAVE_RESTRICT */ - -#ifndef HAVE_INLINE -# ifdef HAVE___INLINE -# define inline __inline -# else -# define inline -# endif -#endif /* HAVE_INLINE */ - - #cmakedefine WORDS_BIGENDIAN 1 #cmakedefine HAVE_BYTESWAP_H 1 |