summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-05-25 19:04:45 (GMT)
committerBrad King <brad.king@kitware.com>2020-05-25 19:06:34 (GMT)
commit3cd5ed7cb1d49a5a722090f2189a9481df77fcb0 (patch)
treeb12f6e79883c883d3d5abc1262ba31980dbdc697
parent3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db (diff)
downloadCMake-3cd5ed7cb1d49a5a722090f2189a9481df77fcb0.zip
CMake-3cd5ed7cb1d49a5a722090f2189a9481df77fcb0.tar.gz
CMake-3cd5ed7cb1d49a5a722090f2189a9481df77fcb0.tar.bz2
liblzma: Drop unused code providing uintmax_t and intmax_t
The lzma library code we use within CMake does not need these.
-rw-r--r--Utilities/cmliblzma/CMakeLists.txt2
-rw-r--r--Utilities/cmliblzma/config.h.in14
2 files changed, 0 insertions, 16 deletions
diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt
index b443fd6..74866e1 100644
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@ -63,12 +63,10 @@ set(HAVE_MF_HC4 1)
CHECK_TYPE_SIZE(int16_t INT16_T)
CHECK_TYPE_SIZE(int32_t INT32_T)
CHECK_TYPE_SIZE(int64_t INT64_T)
-CHECK_TYPE_SIZE(intmax_t INTMAX_T)
CHECK_TYPE_SIZE(uint8_t UINT8_T)
CHECK_TYPE_SIZE(uint16_t UINT16_T)
CHECK_TYPE_SIZE(uint32_t UINT32_T)
CHECK_TYPE_SIZE(uint64_t UINT64_T)
-CHECK_TYPE_SIZE(uintmax_t UINTMAX_T)
CHECK_TYPE_SIZE("short" SIZE_OF_SHORT)
CHECK_TYPE_SIZE("int" SIZE_OF_INT)
diff --git a/Utilities/cmliblzma/config.h.in b/Utilities/cmliblzma/config.h.in
index 06f7fcb..50c3840 100644
--- a/Utilities/cmliblzma/config.h.in
+++ b/Utilities/cmliblzma/config.h.in
@@ -7,13 +7,11 @@
#cmakedefine HAVE_INT16_T
#cmakedefine HAVE_INT32_T
#cmakedefine HAVE_INT64_T
-#cmakedefine HAVE_INTMAX_T
#cmakedefine HAVE_UINT8_T
#cmakedefine HAVE_UINT16_T
#cmakedefine HAVE_UINT32_T
#cmakedefine HAVE_UINT64_T
-#cmakedefine HAVE_UINTMAX_T
/* We might have the types we want under other spellings. */
#cmakedefine HAVE___INT64
@@ -166,18 +164,6 @@ typedef unsigned char uint8_t;
#error No 8-bit unsigned integer type was found.
#endif
-/* Define intmax_t and uintmax_t if they are not already defined. */
-#if !defined(HAVE_INTMAX_T)
-typedef int64_t intmax_t;
-#define INTMAX_MIN INT64_MIN
-#define INTMAX_MAX INT64_MAX
-#endif
-
-#if !defined(HAVE_UINTMAX_T)
-typedef uint64_t uintmax_t;
-#endif
-
-
#cmakedefine uintptr_t @uintptr_t@
#cmakedefine WORDS_BIGENDIAN 1