diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt
index fc50dbe21..856e41ed5 100644
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@ -31,9 +31,15 @@ CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
 CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
 CHECK_INCLUDE_FILE(sys/sysctl.h HAVE_SYS_SYSCTL_H)
 
-CHECK_SYMBOL_EXISTS(bswap_16 byteswap.h HAVE_BSWAP_16)
-CHECK_SYMBOL_EXISTS(bswap_32 byteswap.h HAVE_BSWAP_32)
-CHECK_SYMBOL_EXISTS(bswap_64 byteswap.h HAVE_BSWAP_64)
+CHECK_C_SOURCE_COMPILES (
+  "#include<byteswap.h>\nint main(void){bswap_16(0);return 0;}"
+  HAVE_BSWAP_16)
+CHECK_C_SOURCE_COMPILES (
+  "#include<byteswap.h>\nint main(void){bswap_32(0);return 0;}"
+  HAVE_BSWAP_32)
+CHECK_C_SOURCE_COMPILES (
+  "#include<byteswap.h>\nint main(void){bswap_64(0);return 0;}"
+  HAVE_BSWAP_64)
 
 TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
 
diff --git a/Utilities/cmliblzma/liblzma/check/sha256.c b/Utilities/cmliblzma/liblzma/check/sha256.c
index b09ccbf4d..c2c85eb23 100644
--- a/Utilities/cmliblzma/liblzma/check/sha256.c
+++ b/Utilities/cmliblzma/liblzma/check/sha256.c
@@ -80,11 +80,7 @@ static const uint32_t SHA256_K[64] = {
 
 
 static void
-#ifndef _MSC_VER
-transform(uint32_t state[static 8], const uint32_t data[static 16])
-#else
 transform(uint32_t state[], const uint32_t data[])
-#endif
 {
 	uint32_t W[16];
 	uint32_t T[8];