diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-05 13:22:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-05 13:22:28 (GMT) |
| commit | f174a1cc61a629c77db49e7ffae74b8c7d60d618 (patch) | |
| tree | 3a79da7dceb93187005055d3dd6b9e55701a4d28 | |
| parent | a67b6353940434c856cc332ce490bb6522c32814 (diff) | |
| parent | 2dd17a546f0a2dafacf53b5db1e9ead0990d91ea (diff) | |
| download | CMake-f174a1cc61a629c77db49e7ffae74b8c7d60d618.zip CMake-f174a1cc61a629c77db49e7ffae74b8c7d60d618.tar.gz CMake-f174a1cc61a629c77db49e7ffae74b8c7d60d618.tar.bz2 | |
Merge topic 'liblzma-pgi-compiler'
2dd17a54 liblzma: Fix compilation with PGI compiler
| -rw-r--r-- | Utilities/cmliblzma/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Utilities/cmliblzma/liblzma/check/sha256.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt index fc50dbe..856e41e 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 b09ccbf..c2c85eb 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]; |