kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libarchive: Fix intptr_t and uintptr_t configuration

This commit is contained in:
Brad King 2009-11-04 16:06:26 -05:00
parent d785cb0021
commit 9bc63eb30f
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Utilities/cmlibarchive/CMakeLists.txt
View File

@ -589,6 +589,24 @@ IF(NOT HAVE_UINTMAX_T)
ENDIF(MSVC OR BORLAND) ENDIF(MSVC OR BORLAND)
ENDIF(NOT HAVE_UINTMAX_T) 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) CHECK_TYPE_SIZE(wchar_t SIZEOF_WCHAR_T)
IF(HAVE_SIZEOF_WCHAR_T) IF(HAVE_SIZEOF_WCHAR_T)
SET(HAVE_WCHAR_T 1) SET(HAVE_WCHAR_T 1)

10
Utilities/cmlibarchive/build/cmake/config.h.in
View File

@ -695,10 +695,8 @@
do not define. */ do not define. */
#cmakedefine uintmax_t ${uintmax_t} #cmakedefine uintmax_t ${uintmax_t}
/* Define to `unsigned int' if <sys/types.h> does not define. */ /* Define to `int' if <sys/types.h> does not define. */
#cmakedefine uintptr_t ${uintptr_t } #cmakedefine intptr_t ${intptr_t}
#if defined(__BORLANDC__) && !defined(HAVE_STDINT_H) /* Define to `unsigned int' if <sys/types.h> does not define. */
#define uintptr_t unsigned int #cmakedefine uintptr_t ${uintptr_t}
#define intptr_t int
#endif