diff options
Diffstat (limited to 'Utilities/cmlibarchive')
| -rw-r--r-- | Utilities/cmlibarchive/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/build/cmake/config.h.in | 10 |
2 files changed, 22 insertions, 6 deletions
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index 1422372..4ec3ec7 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -589,6 +589,24 @@ IF(NOT HAVE_UINTMAX_T) ENDIF(MSVC OR BORLAND) ENDIF(NOT HAVE_UINTMAX_T) # +CHECK_TYPE_SIZE(intptr_t INTPTR_T) +IF(NOT HAVE_INTPTR_T) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) + SET(intptr_t "int64_t") + ELSE() + SET(intptr_t "int32_t") + ENDIF() +ENDIF(NOT HAVE_INTPTR_T) +# +CHECK_TYPE_SIZE(uintptr_t UINTPTR_T) +IF(NOT HAVE_UINTPTR_T) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) + SET(uintptr_t "uint64_t") + ELSE() + SET(uintptr_t "uint32_t") + ENDIF() +ENDIF(NOT HAVE_UINTPTR_T) +# CHECK_TYPE_SIZE(wchar_t SIZEOF_WCHAR_T) IF(HAVE_SIZEOF_WCHAR_T) SET(HAVE_WCHAR_T 1) diff --git a/Utilities/cmlibarchive/build/cmake/config.h.in b/Utilities/cmlibarchive/build/cmake/config.h.in index 07e7386..b72c49f 100644 --- a/Utilities/cmlibarchive/build/cmake/config.h.in +++ b/Utilities/cmlibarchive/build/cmake/config.h.in @@ -695,10 +695,8 @@ do not define. */ #cmakedefine uintmax_t ${uintmax_t} -/* Define to `unsigned int' if <sys/types.h> does not define. */ -#cmakedefine uintptr_t ${uintptr_t } +/* Define to `int' if <sys/types.h> does not define. */ +#cmakedefine intptr_t ${intptr_t} -#if defined(__BORLANDC__) && !defined(HAVE_STDINT_H) -#define uintptr_t unsigned int -#define intptr_t int -#endif +/* Define to `unsigned int' if <sys/types.h> does not define. */ +#cmakedefine uintptr_t ${uintptr_t} |