Configure intptr_t and uintptr_t defaults

We define these to 32- or 64-bit signed and unsigned integer types
depending on the pointer size of the target platform.

SVN-Revision: 1634

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fdfd09858b52a0b024e0b1f7a827ce36b49af82..dbd847c127dd04f62461863fd13634e9bf33f47d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -574,6 +574,24 @@ IF(NOT HAVE_UINTMAX_T)
   SET(uintmax_t "uint64_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)
 IF(HAVE_SIZEOF_WCHAR_T)
   SET(HAVE_WCHAR_T 1)

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index e95c83d10aa64c2d78cf6683464d91015d1047d2..1c1815593a026a794df66560f18b1b763d2f727c 100644 (file)
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -701,6 +701,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}
 
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#cmakedefine uintptr_t ${uintptr_t}