Browse Source

libarchive: Drop unused code providing uintmax_t and intmax_t

The libarchive library code we use within CMake does not need these.
Brad King 5 years ago
parent
commit
a7e66cac16

+ 0 - 2
Utilities/cmlibarchive/CMakeLists.txt

@@ -1577,12 +1577,10 @@ CHECK_TYPE_SIZE("unsigned __int64" UNSIGNED___INT64)
 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(dev_t       DEV_T)
 IF(NOT HAVE_DEV_T)

+ 0 - 11
Utilities/cmlibarchive/build/cmake/config.h.in

@@ -11,13 +11,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
@@ -170,15 +168,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;
-#endif
-
-#if !defined(HAVE_UINTMAX_T)
-typedef uint64_t uintmax_t;
-#endif
-
 /* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
 #cmakedefine ZLIB_WINAPI 1