瀏覽代碼

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`).
Brad King 7 年之前
父節點
當前提交
9f77124ea8
共有 2 個文件被更改,包括 0 次插入40 次删除
  1. 0 16
      Utilities/cmliblzma/CMakeLists.txt
  2. 0 24
      Utilities/cmliblzma/config.h.in

+ 0 - 16
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)

+ 0 - 24
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