diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-04 20:09:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-04 20:09:49 (GMT) |
| commit | ac88ce2536e1522052ee7bf330ae06a0ce3e1a87 (patch) | |
| tree | dcc2d2beb310aeafbbe2cf8328e734112cc81b0f | |
| parent | eb505ef32b09552bc6e4445f193ae3823025aab8 (diff) | |
| parent | 996f822930b02fbf6f7b1bc2fa21ad52b10ebdcd (diff) | |
| download | CMake-ac88ce2536e1522052ee7bf330ae06a0ce3e1a87.zip CMake-ac88ce2536e1522052ee7bf330ae06a0ce3e1a87.tar.gz CMake-ac88ce2536e1522052ee7bf330ae06a0ce3e1a87.tar.bz2 | |
Merge topic 'fix-missing-SIZE_MAX'
996f8229 liblzma: fix build on platforms with no SIZE_MAX defined.
| -rw-r--r-- | Utilities/cmliblzma/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Utilities/cmliblzma/common/sysdefs.h | 4 | ||||
| -rw-r--r-- | Utilities/cmliblzma/config.h.in | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt index c03147f..d991438 100644 --- a/Utilities/cmliblzma/CMakeLists.txt +++ b/Utilities/cmliblzma/CMakeLists.txt @@ -95,6 +95,7 @@ CHECK_TYPE_SIZE("unsigned short" SIZE_OF_UNSIGNED_SHORT) CHECK_TYPE_SIZE("unsigned" SIZE_OF_UNSIGNED) CHECK_TYPE_SIZE("unsigned long" SIZE_OF_UNSIGNED_LONG) CHECK_TYPE_SIZE("unsigned long long" SIZE_OF_UNSIGNED_LONG_LONG) +CHECK_TYPE_SIZE("size_t" SIZE_OF_SIZE_T) CHECK_TYPE_SIZE("__int64" __INT64) CHECK_TYPE_SIZE("unsigned __int64" UNSIGNED___INT64) diff --git a/Utilities/cmliblzma/common/sysdefs.h b/Utilities/cmliblzma/common/sysdefs.h index c84f01c..a6edea8 100644 --- a/Utilities/cmliblzma/common/sysdefs.h +++ b/Utilities/cmliblzma/common/sysdefs.h @@ -124,9 +124,9 @@ // The code currently assumes that size_t is either 32-bit or 64-bit. #ifndef SIZE_MAX -# if SIZEOF_SIZE_T == 4 +# if SIZE_OF_SIZE_T == 4 # define SIZE_MAX UINT32_MAX -# elif SIZEOF_SIZE_T == 8 +# elif SIZE_OF_SIZE_T == 8 # define SIZE_MAX UINT64_MAX # else # error size_t is not 32-bit or 64-bit diff --git a/Utilities/cmliblzma/config.h.in b/Utilities/cmliblzma/config.h.in index b197f27..017c435 100644 --- a/Utilities/cmliblzma/config.h.in +++ b/Utilities/cmliblzma/config.h.in @@ -29,6 +29,7 @@ @SIZE_OF_UNSIGNED_CODE@ @SIZE_OF_UNSIGNED_LONG_CODE@ @SIZE_OF_UNSIGNED_LONG_LONG_CODE@ +@SIZE_OF_SIZE_T_CODE@ /* * If we lack int64_t, define it to the first of __int64, int, long, and long long @@ -277,9 +278,6 @@ typedef uint64_t uintmax_t; /* Define to 1 if the system has the type `_Bool'. */ #cmakedefine HAVE__BOOL 1 -/* The size of `size_t', as computed by sizeof. */ -#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@ - /* Define to 1 if the system supports fast unaligned access to 16-bit and 32-bit integers. */ #define TUKLIB_FAST_UNALIGNED_ACCESS 1 |